From a5e376b61608054e27de42e0bdc8b657004faea8 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Wed, 28 Apr 2021 09:22:19 +1000 Subject: [PATCH 01/29] import of Signal's code to deal with attachments saving --- .../securesms/util/SaveAttachmentTask.kt | 146 ++++++++++++++++-- .../securesms/util/StreamUtil.java | 95 ++++++++++++ .../externalstorage/ExternalStorageUtil.kt | 27 ++++ 3 files changed, 258 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index ee1cf128e6..fba4a7cd23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -1,26 +1,30 @@ package org.thoughtcrime.securesms.util +import android.content.ContentResolver import android.content.ContentValues import android.content.Context import android.content.DialogInterface.OnClickListener +import android.media.MediaScannerConnection import android.net.Uri import android.os.Build +import android.os.Environment import android.provider.MediaStore import android.text.TextUtils import android.webkit.MimeTypeMap import android.widget.Toast import androidx.appcompat.app.AlertDialog import network.loki.messenger.R +import org.session.libsession.utilities.task.ProgressDialogAsyncTask +import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil import org.session.libsignal.utilities.logging.Log import org.thoughtcrime.securesms.mms.PartAuthority -import org.session.libsession.utilities.task.ProgressDialogAsyncTask import java.io.File +import java.io.FileOutputStream import java.io.IOException import java.lang.ref.WeakReference import java.text.SimpleDateFormat -import kotlin.jvm.Throws - -import org.session.libsession.utilities.Util +import java.util.* +import java.util.concurrent.TimeUnit /** * Saves attachment files to an external storage using [MediaStore] API. @@ -93,13 +97,14 @@ class SaveAttachmentTask : ProgressDialogAsyncTask { collectionUri = MediaStore.Audio.Media.getContentUri(mediaVolume) - mediaRecord.put(MediaStore.Audio.Media.DISPLAY_NAME, fileName) + mediaRecord.put(MediaStore.Audio.Media.TITLE, "test") + mediaRecord.put(MediaStore.Audio.Media.DISPLAY_NAME, "test") mediaRecord.put(MediaStore.Audio.Media.MIME_TYPE, contentType) mediaRecord.put(MediaStore.Audio.Media.DATE_ADDED, System.currentTimeMillis()) mediaRecord.put(MediaStore.Audio.Media.DATE_TAKEN, System.currentTimeMillis()) + val directory = context.getExternalFilesDir(Environment.DIRECTORY_MUSIC) + mediaRecord.put(MediaStore.Audio.Media.DATA, String.format("%s/%s", directory, fileName)) + //collectionUri = directory?.toUri()!! } contentType.startsWith("image/") -> { @@ -160,6 +169,124 @@ class SaveAttachmentTask : ProgressDialogAsyncTask + if (inputStream == null) { + return null + } + if (outputUri.scheme == ContentResolver.SCHEME_FILE) { + FileOutputStream(mediaUri!!.path).use { outputStream -> + StreamUtil.copy(inputStream, outputStream) + MediaScannerConnection.scanFile(context, arrayOf(mediaUri.path), arrayOf(contentType), null) + } + } else { + context.contentResolver.openOutputStream(mediaUri!!, "w").use { outputStream -> + val total: Long = StreamUtil.copy(inputStream, outputStream) + if (total > 0) { + updateValues.put(MediaStore.MediaColumns.SIZE, total) + } + } + } + } + if (Build.VERSION.SDK_INT > 28) { + updateValues.put(MediaStore.MediaColumns.IS_PENDING, 0) + } + if (updateValues.size() > 0) { + getContext().contentResolver.update(mediaUri!!, updateValues, null, null) + } + return outputUri.lastPathSegment + } + + private fun getMediaStoreContentUriForType(contentType: String): Uri { + return when { + contentType.startsWith("video/") -> + ExternalStorageUtil.getVideoUri() + contentType.startsWith("audio/") -> + ExternalStorageUtil.getAudioUri() + contentType.startsWith("image/") -> + ExternalStorageUtil.getImageUri() + else -> + ExternalStorageUtil.getDownloadUri() + } + } + + @Throws(IOException::class) + private fun createOutputUri(outputUri: Uri, contentType: String, fileName: String): Uri? { + val fileParts: Array = getFileNameParts(fileName) + val base = fileParts[0] + val extension = fileParts[1] + val mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension) + val contentValues = ContentValues() + contentValues.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName) + contentValues.put(MediaStore.MediaColumns.MIME_TYPE, mimeType) + contentValues.put(MediaStore.MediaColumns.DATE_ADDED, TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())) + contentValues.put(MediaStore.MediaColumns.DATE_MODIFIED, TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())) + if (Build.VERSION.SDK_INT > 28) { + contentValues.put(MediaStore.MediaColumns.IS_PENDING, 1) + } else if (Objects.equals(outputUri.scheme, ContentResolver.SCHEME_FILE)) { + val outputDirectory = File(outputUri.path) + var outputFile = File(outputDirectory, "$base.$extension") + var i = 0 + while (outputFile.exists()) { + outputFile = File(outputDirectory, base + "-" + ++i + "." + extension) + } + if (outputFile.isHidden) { + throw IOException("Specified name would not be visible") + } + return Uri.fromFile(outputFile) + } else { + var outputFileName = fileName + var dataPath = java.lang.String.format("%s/%s", getMediaStoreContentUriForType(contentType), outputFileName) + var i = 0 + while (pathTaken(outputUri, dataPath)) { + Log.d(TAG, "The content exists. Rename and check again.") + outputFileName = base + "-" + ++i + "." + extension + dataPath = java.lang.String.format("%s/%s", getMediaStoreContentUriForType(contentType), outputFileName) + } + contentValues.put(MediaStore.MediaColumns.DATA, dataPath) + } + return context.contentResolver.insert(outputUri, contentValues) + } + + private fun getFileNameParts(fileName: String): Array { + val tokens = fileName.split("\\.(?=[^\\.]+$)".toRegex()).toTypedArray() + return arrayOf(tokens[0], if (tokens.size > 1) tokens[1] else "") + } + + private fun getExternalPathToFileForType(contentType: String): String { + val storage: File = when { + contentType.startsWith("video/") -> + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES) + contentType.startsWith("audio/") -> + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC) + contentType.startsWith("image/") -> + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + else -> + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + } + return storage.absolutePath + } + + @Throws(IOException::class) + private fun pathTaken(outputUri: Uri, dataPath: String): Boolean { + context.contentResolver.query(outputUri, arrayOf(MediaStore.MediaColumns.DATA), + MediaStore.MediaColumns.DATA + " = ?", arrayOf(dataPath), + null).use { cursor -> + if (cursor == null) { + throw IOException("Something is wrong with the filename to save") + } + return cursor.moveToFirst() + } } private fun generateOutputFileName(contentType: String, timestamp: Long): String { @@ -177,8 +304,7 @@ class SaveAttachmentTask : ProgressDialogAsyncTask) { super.onPostExecute(result) - val context = contextReference.get() - if (context == null) return + val context = contextReference.get() ?: return when (result.first) { RESULT_FAILURE -> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java new file mode 100644 index 0000000000..32c381c00a --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java @@ -0,0 +1,95 @@ +package org.thoughtcrime.securesms.util; + +import androidx.annotation.Nullable; + +import org.session.libsignal.utilities.logging.Log; + +import java.io.ByteArrayOutputStream; +import java.io.Closeable; +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * Utility methods for input and output streams. + */ +public final class StreamUtil { + + private static final String TAG = Log.tag(StreamUtil.class); + + private StreamUtil() {} + + public static void close(@Nullable Closeable closeable) { + if (closeable == null) return; + + try { + closeable.close(); + } catch (IOException e) { + Log.w(TAG, e); + } + } + + public static long getStreamLength(InputStream in) throws IOException { + byte[] buffer = new byte[4096]; + int totalSize = 0; + + int read; + + while ((read = in.read(buffer)) != -1) { + totalSize += read; + } + + return totalSize; + } + + public static void readFully(InputStream in, byte[] buffer) throws IOException { + readFully(in, buffer, buffer.length); + } + + public static void readFully(InputStream in, byte[] buffer, int len) throws IOException { + int offset = 0; + + for (;;) { + int read = in.read(buffer, offset, len - offset); + if (read == -1) throw new EOFException("Stream ended early"); + + if (read + offset < len) offset += read; + else return; + } + } + + public static byte[] readFully(InputStream in) throws IOException { + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + byte[] buffer = new byte[4096]; + int read; + + while ((read = in.read(buffer)) != -1) { + bout.write(buffer, 0, read); + } + + in.close(); + + return bout.toByteArray(); + } + + public static String readFullyAsString(InputStream in) throws IOException { + return new String(readFully(in)); + } + + public static long copy(InputStream in, OutputStream out) throws IOException { + byte[] buffer = new byte[64 * 1024]; + int read; + long total = 0; + + while ((read = in.read(buffer)) != -1) { + out.write(buffer, 0, read); + total += read; + } + + in.close(); + out.close(); + + return total; + } +} diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt b/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt index fc6c858fd9..4957045a61 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt @@ -1,7 +1,10 @@ package org.session.libsignal.utilities.externalstorage import android.content.Context +import android.net.Uri +import android.os.Build import android.os.Environment +import android.provider.MediaStore import java.io.File object ExternalStorageUtil { @@ -45,6 +48,30 @@ object ExternalStorageUtil { return context.externalCacheDir } + fun getVideoUri(): Uri { + return MediaStore.Video.Media.EXTERNAL_CONTENT_URI; + } + + fun getAudioUri(): Uri { + return MediaStore.Audio.Media.EXTERNAL_CONTENT_URI; + } + + fun getImageUri(): Uri { + return MediaStore.Images.Media.EXTERNAL_CONTENT_URI; + } + + fun getDownloadUri(): Uri { + if (Build.VERSION.SDK_INT < 29) { + return getLegacyUri(Environment.DIRECTORY_DOWNLOADS); + } else { + return MediaStore.Downloads.EXTERNAL_CONTENT_URI; + } + } + + private fun getLegacyUri(directory: String): Uri { + return Uri.fromFile(Environment.getExternalStoragePublicDirectory(directory)) + } + @JvmStatic fun getCleanFileName(fileName: String?): String? { var fileName = fileName ?: return null From 6d29c5b8dcf8327fce4fb256176774bf182a6fc2 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 29 Apr 2021 16:27:34 +1000 Subject: [PATCH 02/29] removing call to deprecated method getExternalStoragePublicDirectory --- .../securesms/util/SaveAttachmentTask.kt | 86 ++----------------- 1 file changed, 6 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index fba4a7cd23..e42ae3c3d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -97,80 +97,6 @@ class SaveAttachmentTask : ProgressDialogAsyncTask { - collectionUri = MediaStore.Video.Media.getContentUri(mediaVolume) - mediaRecord.put(MediaStore.Video.Media.DISPLAY_NAME, fileName) - mediaRecord.put(MediaStore.Video.Media.MIME_TYPE, contentType) - // Add the date meta data to ensure the image is added at the front of the gallery - mediaRecord.put(MediaStore.Video.Media.DATE_ADDED, System.currentTimeMillis()) - mediaRecord.put(MediaStore.Video.Media.DATE_TAKEN, System.currentTimeMillis()) - - } - contentType.startsWith("audio/") -> { - collectionUri = MediaStore.Audio.Media.getContentUri(mediaVolume) - mediaRecord.put(MediaStore.Audio.Media.TITLE, "test") - mediaRecord.put(MediaStore.Audio.Media.DISPLAY_NAME, "test") - mediaRecord.put(MediaStore.Audio.Media.MIME_TYPE, contentType) - mediaRecord.put(MediaStore.Audio.Media.DATE_ADDED, System.currentTimeMillis()) - mediaRecord.put(MediaStore.Audio.Media.DATE_TAKEN, System.currentTimeMillis()) - val directory = context.getExternalFilesDir(Environment.DIRECTORY_MUSIC) - mediaRecord.put(MediaStore.Audio.Media.DATA, String.format("%s/%s", directory, fileName)) - //collectionUri = directory?.toUri()!! - - } - contentType.startsWith("image/") -> { - collectionUri = MediaStore.Images.Media.getContentUri(mediaVolume) - mediaRecord.put(MediaStore.Images.Media.TITLE, fileName) - mediaRecord.put(MediaStore.Images.Media.DISPLAY_NAME, fileName) - mediaRecord.put(MediaStore.Images.Media.MIME_TYPE, contentType) - mediaRecord.put(MediaStore.Images.Media.DATE_ADDED, System.currentTimeMillis()) - mediaRecord.put(MediaStore.Images.Media.DATE_TAKEN, System.currentTimeMillis()) - - } - else -> { - mediaRecord.put(MediaStore.Files.FileColumns.DISPLAY_NAME, fileName) - collectionUri = MediaStore.Files.getContentUri(mediaVolume) - } - } - - var mediaFileUri: Uri? - try { - mediaFileUri = resolver.insert(collectionUri, mediaRecord) - } catch (exception: Exception) { - return null - } - if (mediaFileUri == null) return null - - val inputStream = PartAuthority.getAttachmentStream(context, attachment.uri) - if (inputStream == null) return null - - inputStream.use { - resolver.openOutputStream(mediaFileUri).use { - Util.copy(inputStream, it) - } - } - - return mediaFileUri.toString() - }*/ - @Throws(IOException::class) private fun saveAttachment(context: Context, attachment: Attachment): String? { val contentType = Objects.requireNonNull(MediaUtil.getCorrectedMimeType(attachment.contentType))!! @@ -246,12 +172,12 @@ class SaveAttachmentTask : ProgressDialogAsyncTask - Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES) + context.getExternalFilesDir(Environment.DIRECTORY_MOVIES)!! contentType.startsWith("audio/") -> - Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC) + context.getExternalFilesDir(Environment.DIRECTORY_MUSIC)!! contentType.startsWith("image/") -> - Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + context.getExternalFilesDir(Environment.DIRECTORY_PICTURES)!! else -> - Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS) + context.getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS)!! } return storage.absolutePath } From 99a62d9e99666802d50a7b517b4c6fc1f647b218 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 30 Apr 2021 16:00:13 +1000 Subject: [PATCH 03/29] adding openGroupInvitation types in proto & class --- .../messages/control/OpenGroupInvitation.kt | 51 + libsignal/protobuf/SignalService.proto | 9 +- .../internal/push/SignalServiceProtos.java | 1113 +++++++++++++++-- 3 files changed, 1073 insertions(+), 100 deletions(-) create mode 100644 libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt new file mode 100644 index 0000000000..e43712d46a --- /dev/null +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt @@ -0,0 +1,51 @@ +package org.session.libsession.messaging.messages.control + +import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.utilities.logging.Log + +class OpenGroupInvitation() : ControlMessage() { + + var serverAddress: String? = null; + var channelId: Int? = 0; + var serverName: String? = null; + + companion object { + const val TAG = "OpenGroupInvitation" + + fun fromProto(proto: SignalServiceProtos.Content): OpenGroupInvitation? { + val openGroupInvitationProto = if (proto.hasOpenGroupInvitation()) proto.openGroupInvitation else return null + val serverAddress = openGroupInvitationProto.serverAddress + val channelId = openGroupInvitationProto.channelId + val serverName = openGroupInvitationProto.serverName + return OpenGroupInvitation(serverAddress, channelId, serverName) + } + } + + constructor(serverAddress: String?, channelId: Int, serverName: String?): this() { + this.serverAddress = serverAddress + this.channelId = channelId + this.serverName = serverName + } + + override fun isValid(): Boolean { + if (!super.isValid()) return false + //TODO determine what's required + return (serverAddress != null && channelId != null && serverName != null) + } + + override fun toProto(): SignalServiceProtos.Content? { + val openGroupInvitationProto = SignalServiceProtos.OpenGroupInvitation.newBuilder() + openGroupInvitationProto.serverAddress = serverAddress + openGroupInvitationProto.channelId = channelId ?: 0 + openGroupInvitationProto.serverName = serverName + + val proto = SignalServiceProtos.Content.newBuilder() + return try { + proto.openGroupInvitation = openGroupInvitationProto.build() + proto.build() + } catch (e: Exception) { + Log.w(TAG, "Couldn't construct open group invitation proto from: $this") + null + } + } +} \ No newline at end of file diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto index c748919c4a..24a75efa49 100644 --- a/libsignal/protobuf/SignalService.proto +++ b/libsignal/protobuf/SignalService.proto @@ -40,7 +40,8 @@ message Content { optional ReceiptMessage receiptMessage = 5; optional TypingMessage typingMessage = 6; optional ConfigurationMessage configurationMessage = 7; - optional DataExtractionNotification dataExtractionNotification = 82; + optional DataExtractionNotification dataExtractionNotification = 8; + optional OpenGroupInvitation openGroupInvitation = 9; } message KeyPair { @@ -144,6 +145,12 @@ message DataMessage { optional string syncTarget = 105; } +message OpenGroupInvitation { + optional string serverAddress = 1; + optional uint32 channelId = 2; + optional string serverName = 3; + } + message ConfigurationMessage { message ClosedGroup { diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java index 50aa3e4792..9a4c126c5c 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java @@ -1765,19 +1765,33 @@ public final class SignalServiceProtos { */ org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); - // optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ boolean hasDataExtractionNotification(); /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); + + // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + boolean hasOpenGroupInvitation(); + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation(); + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); } /** * Protobuf type {@code signalservice.Content} @@ -1882,7 +1896,7 @@ public final class SignalServiceProtos { bitField0_ |= 0x00000008; break; } - case 658: { + case 66: { org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = dataExtractionNotification_.toBuilder(); @@ -1895,6 +1909,19 @@ public final class SignalServiceProtos { bitField0_ |= 0x00000010; break; } + case 74: { + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder subBuilder = null; + if (((bitField0_ & 0x00000020) == 0x00000020)) { + subBuilder = openGroupInvitation_.toBuilder(); + } + openGroupInvitation_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(openGroupInvitation_); + openGroupInvitation_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000020; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2023,34 +2050,57 @@ public final class SignalServiceProtos { return configurationMessage_; } - // optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; - public static final int DATAEXTRACTIONNOTIFICATION_FIELD_NUMBER = 82; + // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; + public static final int DATAEXTRACTIONNOTIFICATION_FIELD_NUMBER = 8; private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public boolean hasDataExtractionNotification() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { return dataExtractionNotification_; } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { return dataExtractionNotification_; } + // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + public static final int OPENGROUPINVITATION_FIELD_NUMBER = 9; + private org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation openGroupInvitation_; + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public boolean hasOpenGroupInvitation() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation() { + return openGroupInvitation_; + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + return openGroupInvitation_; + } + private void initFields() { dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2107,7 +2157,10 @@ public final class SignalServiceProtos { output.writeMessage(7, configurationMessage_); } if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(82, dataExtractionNotification_); + output.writeMessage(8, dataExtractionNotification_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + output.writeMessage(9, openGroupInvitation_); } getUnknownFields().writeTo(output); } @@ -2136,7 +2189,11 @@ public final class SignalServiceProtos { } if (((bitField0_ & 0x00000010) == 0x00000010)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(82, dataExtractionNotification_); + .computeMessageSize(8, dataExtractionNotification_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(9, openGroupInvitation_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -2251,6 +2308,7 @@ public final class SignalServiceProtos { getTypingMessageFieldBuilder(); getConfigurationMessageFieldBuilder(); getDataExtractionNotificationFieldBuilder(); + getOpenGroupInvitationFieldBuilder(); } } private static Builder create() { @@ -2289,6 +2347,12 @@ public final class SignalServiceProtos { dataExtractionNotificationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); + } else { + openGroupInvitationBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -2357,6 +2421,14 @@ public final class SignalServiceProtos { } else { result.dataExtractionNotification_ = dataExtractionNotificationBuilder_.build(); } + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000020; + } + if (openGroupInvitationBuilder_ == null) { + result.openGroupInvitation_ = openGroupInvitation_; + } else { + result.openGroupInvitation_ = openGroupInvitationBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2388,6 +2460,9 @@ public final class SignalServiceProtos { if (other.hasDataExtractionNotification()) { mergeDataExtractionNotification(other.getDataExtractionNotification()); } + if (other.hasOpenGroupInvitation()) { + mergeOpenGroupInvitation(other.getOpenGroupInvitation()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -2913,18 +2988,18 @@ public final class SignalServiceProtos { return configurationMessageBuilder_; } - // optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public boolean hasDataExtractionNotification() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { @@ -2934,7 +3009,7 @@ public final class SignalServiceProtos { } } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder setDataExtractionNotification(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { @@ -2950,7 +3025,7 @@ public final class SignalServiceProtos { return this; } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder setDataExtractionNotification( org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { @@ -2964,7 +3039,7 @@ public final class SignalServiceProtos { return this; } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder mergeDataExtractionNotification(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { @@ -2983,7 +3058,7 @@ public final class SignalServiceProtos { return this; } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder clearDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { @@ -2996,7 +3071,7 @@ public final class SignalServiceProtos { return this; } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { bitField0_ |= 0x00000010; @@ -3004,7 +3079,7 @@ public final class SignalServiceProtos { return getDataExtractionNotificationFieldBuilder().getBuilder(); } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { if (dataExtractionNotificationBuilder_ != null) { @@ -3014,7 +3089,7 @@ public final class SignalServiceProtos { } } /** - * optional .signalservice.DataExtractionNotification dataExtractionNotification = 82; + * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ private com.google.protobuf.SingleFieldBuilder< org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> @@ -3030,6 +3105,123 @@ public final class SignalServiceProtos { return dataExtractionNotificationBuilder_; } + // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + private org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public boolean hasOpenGroupInvitation() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation() { + if (openGroupInvitationBuilder_ == null) { + return openGroupInvitation_; + } else { + return openGroupInvitationBuilder_.getMessage(); + } + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public Builder setOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation value) { + if (openGroupInvitationBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + openGroupInvitation_ = value; + onChanged(); + } else { + openGroupInvitationBuilder_.setMessage(value); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public Builder setOpenGroupInvitation( + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder builderForValue) { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = builderForValue.build(); + onChanged(); + } else { + openGroupInvitationBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public Builder mergeOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation value) { + if (openGroupInvitationBuilder_ == null) { + if (((bitField0_ & 0x00000020) == 0x00000020) && + openGroupInvitation_ != org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance()) { + openGroupInvitation_ = + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); + } else { + openGroupInvitation_ = value; + } + onChanged(); + } else { + openGroupInvitationBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public Builder clearOpenGroupInvitation() { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); + onChanged(); + } else { + openGroupInvitationBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000020); + return this; + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { + bitField0_ |= 0x00000020; + onChanged(); + return getOpenGroupInvitationFieldBuilder().getBuilder(); + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + if (openGroupInvitationBuilder_ != null) { + return openGroupInvitationBuilder_.getMessageOrBuilder(); + } else { + return openGroupInvitation_; + } + } + /** + * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; + */ + private com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder> + getOpenGroupInvitationFieldBuilder() { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder>( + openGroupInvitation_, + getParentForChildren(), + isClean()); + openGroupInvitation_ = null; + } + return openGroupInvitationBuilder_; + } + // @@protoc_insertion_point(builder_scope:signalservice.Content) } @@ -12760,6 +12952,714 @@ public final class SignalServiceProtos { // @@protoc_insertion_point(class_scope:signalservice.DataMessage) } + public interface OpenGroupInvitationOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional string serverAddress = 1; + /** + * optional string serverAddress = 1; + */ + boolean hasServerAddress(); + /** + * optional string serverAddress = 1; + */ + java.lang.String getServerAddress(); + /** + * optional string serverAddress = 1; + */ + com.google.protobuf.ByteString + getServerAddressBytes(); + + // optional uint32 channelId = 2; + /** + * optional uint32 channelId = 2; + */ + boolean hasChannelId(); + /** + * optional uint32 channelId = 2; + */ + int getChannelId(); + + // optional string serverName = 3; + /** + * optional string serverName = 3; + */ + boolean hasServerName(); + /** + * optional string serverName = 3; + */ + java.lang.String getServerName(); + /** + * optional string serverName = 3; + */ + com.google.protobuf.ByteString + getServerNameBytes(); + } + /** + * Protobuf type {@code signalservice.OpenGroupInvitation} + */ + public static final class OpenGroupInvitation extends + com.google.protobuf.GeneratedMessage + implements OpenGroupInvitationOrBuilder { + // Use OpenGroupInvitation.newBuilder() to construct. + private OpenGroupInvitation(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private OpenGroupInvitation(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final OpenGroupInvitation defaultInstance; + public static OpenGroupInvitation getDefaultInstance() { + return defaultInstance; + } + + public OpenGroupInvitation getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private OpenGroupInvitation( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + serverAddress_ = input.readBytes(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + channelId_ = input.readUInt32(); + break; + } + case 26: { + bitField0_ |= 0x00000004; + serverName_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public OpenGroupInvitation parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new OpenGroupInvitation(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional string serverAddress = 1; + public static final int SERVERADDRESS_FIELD_NUMBER = 1; + private java.lang.Object serverAddress_; + /** + * optional string serverAddress = 1; + */ + public boolean hasServerAddress() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string serverAddress = 1; + */ + public java.lang.String getServerAddress() { + java.lang.Object ref = serverAddress_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + serverAddress_ = s; + } + return s; + } + } + /** + * optional string serverAddress = 1; + */ + public com.google.protobuf.ByteString + getServerAddressBytes() { + java.lang.Object ref = serverAddress_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + serverAddress_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional uint32 channelId = 2; + public static final int CHANNELID_FIELD_NUMBER = 2; + private int channelId_; + /** + * optional uint32 channelId = 2; + */ + public boolean hasChannelId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional uint32 channelId = 2; + */ + public int getChannelId() { + return channelId_; + } + + // optional string serverName = 3; + public static final int SERVERNAME_FIELD_NUMBER = 3; + private java.lang.Object serverName_; + /** + * optional string serverName = 3; + */ + public boolean hasServerName() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional string serverName = 3; + */ + public java.lang.String getServerName() { + java.lang.Object ref = serverName_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + serverName_ = s; + } + return s; + } + } + /** + * optional string serverName = 3; + */ + public com.google.protobuf.ByteString + getServerNameBytes() { + java.lang.Object ref = serverName_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + serverName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private void initFields() { + serverAddress_ = ""; + channelId_ = 0; + serverName_ = ""; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeBytes(1, getServerAddressBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeUInt32(2, channelId_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBytes(3, getServerNameBytes()); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getServerAddressBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, channelId_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, getServerNameBytes()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code signalservice.OpenGroupInvitation} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder.class); + } + + // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + serverAddress_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + channelId_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + serverName_ = ""; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getDefaultInstanceForType() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation build() { + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation buildPartial() { + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation result = new org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.serverAddress_ = serverAddress_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.channelId_ = channelId_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.serverName_ = serverName_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation) { + return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation)other); + } else { + super.mergeFrom(other); + return this; + } + } + + 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.hasServerAddress()) { + bitField0_ |= 0x00000001; + serverAddress_ = other.serverAddress_; + onChanged(); + } + if (other.hasChannelId()) { + setChannelId(other.getChannelId()); + } + if (other.hasServerName()) { + bitField0_ |= 0x00000004; + serverName_ = other.serverName_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional string serverAddress = 1; + private java.lang.Object serverAddress_ = ""; + /** + * optional string serverAddress = 1; + */ + public boolean hasServerAddress() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional string serverAddress = 1; + */ + public java.lang.String getServerAddress() { + java.lang.Object ref = serverAddress_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + serverAddress_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string serverAddress = 1; + */ + public com.google.protobuf.ByteString + getServerAddressBytes() { + java.lang.Object ref = serverAddress_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + serverAddress_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string serverAddress = 1; + */ + public Builder setServerAddress( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + serverAddress_ = value; + onChanged(); + return this; + } + /** + * optional string serverAddress = 1; + */ + public Builder clearServerAddress() { + bitField0_ = (bitField0_ & ~0x00000001); + serverAddress_ = getDefaultInstance().getServerAddress(); + onChanged(); + return this; + } + /** + * optional string serverAddress = 1; + */ + public Builder setServerAddressBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + serverAddress_ = value; + onChanged(); + return this; + } + + // optional uint32 channelId = 2; + private int channelId_ ; + /** + * optional uint32 channelId = 2; + */ + public boolean hasChannelId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional uint32 channelId = 2; + */ + public int getChannelId() { + return channelId_; + } + /** + * optional uint32 channelId = 2; + */ + public Builder setChannelId(int value) { + bitField0_ |= 0x00000002; + channelId_ = value; + onChanged(); + return this; + } + /** + * optional uint32 channelId = 2; + */ + public Builder clearChannelId() { + bitField0_ = (bitField0_ & ~0x00000002); + channelId_ = 0; + onChanged(); + return this; + } + + // optional string serverName = 3; + private java.lang.Object serverName_ = ""; + /** + * optional string serverName = 3; + */ + public boolean hasServerName() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional string serverName = 3; + */ + public java.lang.String getServerName() { + java.lang.Object ref = serverName_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + serverName_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string serverName = 3; + */ + public com.google.protobuf.ByteString + getServerNameBytes() { + java.lang.Object ref = serverName_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + serverName_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string serverName = 3; + */ + public Builder setServerName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + serverName_ = value; + onChanged(); + return this; + } + /** + * optional string serverName = 3; + */ + public Builder clearServerName() { + bitField0_ = (bitField0_ & ~0x00000004); + serverName_ = getDefaultInstance().getServerName(); + onChanged(); + return this; + } + /** + * optional string serverName = 3; + */ + public Builder setServerNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + serverName_ = value; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:signalservice.OpenGroupInvitation) + } + + static { + defaultInstance = new OpenGroupInvitation(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:signalservice.OpenGroupInvitation) + } + public interface ConfigurationMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -20199,6 +21099,11 @@ public final class SignalServiceProtos { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_signalservice_OpenGroupInvitation_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_signalservice_ConfigurationMessage_descriptor; private static @@ -20247,84 +21152,88 @@ public final class SignalServiceProtos { "SSAGE\020\007\"{\n\rTypingMessage\022\021\n\ttimestamp\030\001 " + "\002(\004\0223\n\006action\030\002 \002(\0162#.signalservice.Typi" + "ngMessage.Action\"\"\n\006Action\022\013\n\007STARTED\020\000\022" + - "\013\n\007STOPPED\020\001\"\270\002\n\007Content\022/\n\013dataMessage\030", + "\013\n\007STOPPED\020\001\"\371\002\n\007Content\022/\n\013dataMessage\030", "\001 \001(\0132\032.signalservice.DataMessage\0225\n\016rec" + "eiptMessage\030\005 \001(\0132\035.signalservice.Receip" + "tMessage\0223\n\rtypingMessage\030\006 \001(\0132\034.signal" + "service.TypingMessage\022A\n\024configurationMe" + "ssage\030\007 \001(\0132#.signalservice.Configuratio" + - "nMessage\022M\n\032dataExtractionNotification\030R" + + "nMessage\022M\n\032dataExtractionNotification\030\010" + " \001(\0132).signalservice.DataExtractionNotif" + - "ication\"0\n\007KeyPair\022\021\n\tpublicKey\030\001 \002(\014\022\022\n" + - "\nprivateKey\030\002 \002(\014\"\226\001\n\032DataExtractionNoti" + - "fication\022<\n\004type\030\001 \002(\0162..signalservice.D", - "ataExtractionNotification.Type\022\021\n\ttimest" + - "amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" + - "IA_SAVED\020\002\"\215\013\n\013DataMessage\022\014\n\004body\030\001 \001(\t" + - "\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" + - "tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" + - "ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" + - "pireTimer\030\005 \001(\r\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\tt" + - "imestamp\030\007 \001(\004\022/\n\005quote\030\010 \001(\0132 .signalse" + - "rvice.DataMessage.Quote\0223\n\007preview\030\n \003(\013" + - "2\".signalservice.DataMessage.Preview\0227\n\007", - "profile\030e \001(\0132&.signalservice.DataMessag" + - "e.LokiProfile\022W\n\031closedGroupControlMessa" + - "ge\030h \001(\01324.signalservice.DataMessage.Clo" + - "sedGroupControlMessage\022\022\n\nsyncTarget\030i \001" + - "(\t\032\225\002\n\005Quote\022\n\n\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t" + - "\022\014\n\004text\030\003 \001(\t\022F\n\013attachments\030\004 \003(\01321.si" + - "gnalservice.DataMessage.Quote.QuotedAtta" + - "chment\032\231\001\n\020QuotedAttachment\022\023\n\013contentTy" + - "pe\030\001 \001(\t\022\020\n\010fileName\030\002 \001(\t\0223\n\tthumbnail\030" + - "\003 \001(\0132 .signalservice.AttachmentPointer\022", - "\r\n\005flags\030\004 \001(\r\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE" + - "\020\001\032V\n\007Preview\022\013\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(" + - "\t\022/\n\005image\030\003 \001(\0132 .signalservice.Attachm" + - "entPointer\032:\n\013LokiProfile\022\023\n\013displayName" + - "\030\001 \001(\t\022\026\n\016profilePicture\030\002 \001(\t\032\343\003\n\031Close" + - "dGroupControlMessage\022G\n\004type\030\001 \002(\01629.sig" + - "nalservice.DataMessage.ClosedGroupContro" + - "lMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022\014\n\004name" + - "\030\003 \001(\t\0221\n\021encryptionKeyPair\030\004 \001(\0132\026.sign" + - "alservice.KeyPair\022\017\n\007members\030\005 \003(\014\022\016\n\006ad", - "mins\030\006 \003(\014\022U\n\010wrappers\030\007 \003(\0132C.signalser" + - "vice.DataMessage.ClosedGroupControlMessa" + - "ge.KeyPairWrapper\032=\n\016KeyPairWrapper\022\021\n\tp" + - "ublicKey\030\001 \002(\014\022\030\n\020encryptedKeyPair\030\002 \002(\014" + - "\"r\n\004Type\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_KEY_PAIR" + - "\020\003\022\017\n\013NAME_CHANGE\020\004\022\021\n\rMEMBERS_ADDED\020\005\022\023" + - "\n\017MEMBERS_REMOVED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005" + - "Flags\022\033\n\027EXPIRATION_TIMER_UPDATE\020\002\"\316\003\n\024C" + - "onfigurationMessage\022E\n\014closedGroups\030\001 \003(" + - "\0132/.signalservice.ConfigurationMessage.C", - "losedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displa" + - "yName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\np" + - "rofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.sign" + - "alservice.ConfigurationMessage.Contact\032\202" + - "\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004nam" + - "e\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\0132\026.sig" + - "nalservice.KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006a" + - "dmins\030\005 \003(\014\032V\n\007Contact\022\021\n\tpublicKey\030\001 \002(" + - "\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003 \001(\t\022" + - "\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMessage\0220\n", - "\004type\030\001 \002(\0162\".signalservice.ReceiptMessa" + - "ge.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DE" + - "LIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021AttachmentPointer" + - "\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key" + - "\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022" + - "\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005fla" + - "gs\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022" + - "\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021" + - "\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id" + - "\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalservice.Gro", - "upContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030" + - "\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalservice.At" + - "tachmentPointer\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022" + - "\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n" + - "\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org.session" + - ".libsignal.service.internal.pushB\023Signal" + - "ServiceProtos" + "ication\022?\n\023openGroupInvitation\030\t \001(\0132\".s" + + "ignalservice.OpenGroupInvitation\"0\n\007KeyP" + + "air\022\021\n\tpublicKey\030\001 \002(\014\022\022\n\nprivateKey\030\002 \002", + "(\014\"\226\001\n\032DataExtractionNotification\022<\n\004typ" + + "e\030\001 \002(\0162..signalservice.DataExtractionNo" + + "tification.Type\022\021\n\ttimestamp\030\002 \001(\004\"\'\n\004Ty" + + "pe\022\016\n\nSCREENSHOT\020\001\022\017\n\013MEDIA_SAVED\020\002\"\215\013\n\013" + + "DataMessage\022\014\n\004body\030\001 \001(\t\0225\n\013attachments" + + "\030\002 \003(\0132 .signalservice.AttachmentPointer" + + "\022*\n\005group\030\003 \001(\0132\033.signalservice.GroupCon" + + "text\022\r\n\005flags\030\004 \001(\r\022\023\n\013expireTimer\030\005 \001(\r" + + "\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\ttimestamp\030\007 \001(\004\022" + + "/\n\005quote\030\010 \001(\0132 .signalservice.DataMessa", + "ge.Quote\0223\n\007preview\030\n \003(\0132\".signalservic" + + "e.DataMessage.Preview\0227\n\007profile\030e \001(\0132&" + + ".signalservice.DataMessage.LokiProfile\022W" + + "\n\031closedGroupControlMessage\030h \001(\01324.sign" + + "alservice.DataMessage.ClosedGroupControl" + + "Message\022\022\n\nsyncTarget\030i \001(\t\032\225\002\n\005Quote\022\n\n" + + "\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n\004text\030\003 \001(\t\022" + + "F\n\013attachments\030\004 \003(\01321.signalservice.Dat" + + "aMessage.Quote.QuotedAttachment\032\231\001\n\020Quot" + + "edAttachment\022\023\n\013contentType\030\001 \001(\t\022\020\n\010fil", + "eName\030\002 \001(\t\0223\n\tthumbnail\030\003 \001(\0132 .signals" + + "ervice.AttachmentPointer\022\r\n\005flags\030\004 \001(\r\"" + + "\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\032V\n\007Preview\022\013" + + "\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/\n\005image\030\003 \001(" + + "\0132 .signalservice.AttachmentPointer\032:\n\013L" + + "okiProfile\022\023\n\013displayName\030\001 \001(\t\022\026\n\016profi" + + "lePicture\030\002 \001(\t\032\343\003\n\031ClosedGroupControlMe" + + "ssage\022G\n\004type\030\001 \002(\01629.signalservice.Data" + + "Message.ClosedGroupControlMessage.Type\022\021" + + "\n\tpublicKey\030\002 \001(\014\022\014\n\004name\030\003 \001(\t\0221\n\021encry", + "ptionKeyPair\030\004 \001(\0132\026.signalservice.KeyPa" + + "ir\022\017\n\007members\030\005 \003(\014\022\016\n\006admins\030\006 \003(\014\022U\n\010w" + + "rappers\030\007 \003(\0132C.signalservice.DataMessag" + + "e.ClosedGroupControlMessage.KeyPairWrapp" + + "er\032=\n\016KeyPairWrapper\022\021\n\tpublicKey\030\001 \002(\014\022" + + "\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW" + + "\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" + + "ED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXPIRA" + + "TION_TIMER_UPDATE\020\002\"S\n\023OpenGroupInvitati", + "on\022\025\n\rserverAddress\030\001 \001(\t\022\021\n\tchannelId\030\002" + + " \001(\r\022\022\n\nserverName\030\003 \001(\t\"\316\003\n\024Configurati" + + "onMessage\022E\n\014closedGroups\030\001 \003(\0132/.signal" + + "service.ConfigurationMessage.ClosedGroup" + + "\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 \001(" + + "\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKey\030" + + "\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservice." + + "ConfigurationMessage.Contact\032\202\001\n\013ClosedG" + + "roup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n" + + "\021encryptionKeyPair\030\003 \001(\0132\026.signalservice", + ".KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(" + + "\014\032V\n\007Contact\022\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030" + + "\002 \002(\t\022\026\n\016profilePicture\030\003 \001(\t\022\022\n\nprofile" + + "Key\030\004 \001(\014\"u\n\016ReceiptMessage\0220\n\004type\030\001 \002(" + + "\0162\".signalservice.ReceiptMessage.Type\022\021\n" + + "\ttimestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010" + + "\n\004READ\020\001\"\354\001\n\021AttachmentPointer\022\n\n\002id\030\001 \002" + + "(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004" + + "size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006digest\030" + + "\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r", + "\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption" + + "\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_ME" + + "SSAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004" + + "type\030\002 \001(\0162 .signalservice.GroupContext." + + "Type\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006a" + + "vatar\030\005 \001(\0132 .signalservice.AttachmentPo" + + "inter\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN" + + "\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n" + + "\014REQUEST_INFO\020\004BB\n+org.session.libsignal" + + ".service.internal.pushB\023SignalServicePro", + "tos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -20348,7 +21257,7 @@ public final class SignalServiceProtos { internal_static_signalservice_Content_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_Content_descriptor, - new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", }); + new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", "OpenGroupInvitation", }); internal_static_signalservice_KeyPair_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_signalservice_KeyPair_fieldAccessorTable = new @@ -20403,8 +21312,14 @@ public final class SignalServiceProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor, new java.lang.String[] { "PublicKey", "EncryptedKeyPair", }); - internal_static_signalservice_ConfigurationMessage_descriptor = + internal_static_signalservice_OpenGroupInvitation_descriptor = getDescriptor().getMessageTypes().get(6); + internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_signalservice_OpenGroupInvitation_descriptor, + new java.lang.String[] { "ServerAddress", "ChannelId", "ServerName", }); + internal_static_signalservice_ConfigurationMessage_descriptor = + getDescriptor().getMessageTypes().get(7); internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_ConfigurationMessage_descriptor, @@ -20422,19 +21337,19 @@ public final class SignalServiceProtos { internal_static_signalservice_ConfigurationMessage_Contact_descriptor, new java.lang.String[] { "PublicKey", "Name", "ProfilePicture", "ProfileKey", }); internal_static_signalservice_ReceiptMessage_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(8); internal_static_signalservice_ReceiptMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_ReceiptMessage_descriptor, new java.lang.String[] { "Type", "Timestamp", }); internal_static_signalservice_AttachmentPointer_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(9); internal_static_signalservice_AttachmentPointer_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_AttachmentPointer_descriptor, new java.lang.String[] { "Id", "ContentType", "Key", "Size", "Thumbnail", "Digest", "FileName", "Flags", "Width", "Height", "Caption", "Url", }); internal_static_signalservice_GroupContext_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(10); internal_static_signalservice_GroupContext_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_GroupContext_descriptor, From 9ee167c1737aab23012f6dcfc3d4881e79206d26 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 30 Apr 2021 16:09:11 +1000 Subject: [PATCH 04/29] handleOpenGroupInvitation skeleton added + region added --- .../ReceivedMessageHandler.kt | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 34da1396b7..5ddc1a7a62 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -48,10 +48,13 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content, is ExpirationTimerUpdate -> handleExpirationTimerUpdate(message) is DataExtractionNotification -> handleDataExtractionNotification(message) is ConfigurationMessage -> handleConfigurationMessage(message) + is OpenGroupInvitation -> handleOpenGroupInvitation(message) is VisibleMessage -> handleVisibleMessage(message, proto, openGroupID) } } +//region ControlMessage + private fun MessageReceiver.handleReadReceipt(message: ReadReceipt) { val context = MessagingModuleConfiguration.shared.context SSKEnvironment.shared.readReceiptManager.processReadReceipts(context, message.sender!!, message.timestamps!!, message.receivedTimestamp!!) @@ -145,6 +148,18 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) { storage.addContacts(message.contacts) } +// Open group invitation handling + +fun handleOpenGroupInvitation(message: OpenGroupInvitation) { + //TODO +} + +//endregion + +//region VisibleMessage + +// Visible message handling + fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalServiceProtos.Content, openGroupID: String?) { val storage = MessagingModuleConfiguration.shared.storage val context = MessagingModuleConfiguration.shared.context @@ -228,6 +243,10 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalS SSKEnvironment.shared.notificationManager.updateNotification(context, threadID) } +//endregion + +//region ClosedGroupControlMessage + private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroupControlMessage) { when (message.kind!!) { is ClosedGroupControlMessage.Kind.New -> handleNewClosedGroup(message) @@ -562,4 +581,6 @@ fun MessageReceiver.disableLocalGroupAndUnsubscribe(groupPublicKey: String, grou storage.removeMember(groupID, Address.fromSerialized(userPublicKey)) // Notify the PN server PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Unsubscribe, groupPublicKey, userPublicKey) -} \ No newline at end of file +} + +//endregion From bb25877515fa62c6f5ee842235d813aaae5bde2d Mon Sep 17 00:00:00 2001 From: Brice-W Date: Mon, 3 May 2021 14:15:39 +1000 Subject: [PATCH 05/29] light refactor + OpenGroupUrlParser implementation & unit test --- .../messages/control/OpenGroupInvitation.kt | 27 +- .../utilities/OpenGroupUrlParser.kt | 38 ++ .../utilities/OpenGroupUrlParserTest.kt | 65 ++++ libsignal/protobuf/SignalService.proto | 5 +- .../internal/push/SignalServiceProtos.java | 352 +++++++----------- 5 files changed, 251 insertions(+), 236 deletions(-) create mode 100644 libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt create mode 100644 libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt index e43712d46a..bbb3653719 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt @@ -5,39 +5,34 @@ import org.session.libsignal.utilities.logging.Log class OpenGroupInvitation() : ControlMessage() { - var serverAddress: String? = null; - var channelId: Int? = 0; - var serverName: String? = null; + var groupUrl: String? = null; + var groupName: String? = null; companion object { const val TAG = "OpenGroupInvitation" fun fromProto(proto: SignalServiceProtos.Content): OpenGroupInvitation? { val openGroupInvitationProto = if (proto.hasOpenGroupInvitation()) proto.openGroupInvitation else return null - val serverAddress = openGroupInvitationProto.serverAddress - val channelId = openGroupInvitationProto.channelId - val serverName = openGroupInvitationProto.serverName - return OpenGroupInvitation(serverAddress, channelId, serverName) + val serverAddress = openGroupInvitationProto.groupUrl + val serverName = openGroupInvitationProto.groupName + return OpenGroupInvitation(serverAddress, serverName) } } - constructor(serverAddress: String?, channelId: Int, serverName: String?): this() { - this.serverAddress = serverAddress - this.channelId = channelId - this.serverName = serverName + constructor(url: String?, serverName: String?): this() { + this.groupUrl = url + this.groupName = serverName } override fun isValid(): Boolean { if (!super.isValid()) return false - //TODO determine what's required - return (serverAddress != null && channelId != null && serverName != null) + return (groupUrl != null && groupName != null) } override fun toProto(): SignalServiceProtos.Content? { val openGroupInvitationProto = SignalServiceProtos.OpenGroupInvitation.newBuilder() - openGroupInvitationProto.serverAddress = serverAddress - openGroupInvitationProto.channelId = channelId ?: 0 - openGroupInvitationProto.serverName = serverName + openGroupInvitationProto.groupUrl = groupUrl + openGroupInvitationProto.groupName = groupName val proto = SignalServiceProtos.Content.newBuilder() return try { diff --git a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt new file mode 100644 index 0000000000..ea610fcd4f --- /dev/null +++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt @@ -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) {} diff --git a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt new file mode 100644 index 0000000000..1d82c849d3 --- /dev/null +++ b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt @@ -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) + } +} diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto index 24a75efa49..e5f286cca8 100644 --- a/libsignal/protobuf/SignalService.proto +++ b/libsignal/protobuf/SignalService.proto @@ -146,9 +146,8 @@ message DataMessage { } message OpenGroupInvitation { - optional string serverAddress = 1; - optional uint32 channelId = 2; - optional string serverName = 3; + optional string groupUrl = 1; + optional string groupName = 2; } message ConfigurationMessage { diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java index 9a4c126c5c..8f48a9d8d9 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java @@ -12955,45 +12955,35 @@ public final class SignalServiceProtos { public interface OpenGroupInvitationOrBuilder extends com.google.protobuf.MessageOrBuilder { - // optional string serverAddress = 1; + // optional string groupUrl = 1; /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - boolean hasServerAddress(); + boolean hasGroupUrl(); /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - java.lang.String getServerAddress(); + java.lang.String getGroupUrl(); /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ com.google.protobuf.ByteString - getServerAddressBytes(); + getGroupUrlBytes(); - // optional uint32 channelId = 2; + // optional string groupName = 2; /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - boolean hasChannelId(); + boolean hasGroupName(); /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - int getChannelId(); - - // optional string serverName = 3; + java.lang.String getGroupName(); /** - * optional string serverName = 3; - */ - boolean hasServerName(); - /** - * optional string serverName = 3; - */ - java.lang.String getServerName(); - /** - * optional string serverName = 3; + * optional string groupName = 2; */ com.google.protobuf.ByteString - getServerNameBytes(); + getGroupNameBytes(); } /** * Protobuf type {@code signalservice.OpenGroupInvitation} @@ -13048,17 +13038,12 @@ public final class SignalServiceProtos { } case 10: { bitField0_ |= 0x00000001; - serverAddress_ = input.readBytes(); + groupUrl_ = input.readBytes(); break; } - case 16: { + case 18: { bitField0_ |= 0x00000002; - channelId_ = input.readUInt32(); - break; - } - case 26: { - bitField0_ |= 0x00000004; - serverName_ = input.readBytes(); + groupName_ = input.readBytes(); break; } } @@ -13101,20 +13086,20 @@ public final class SignalServiceProtos { } private int bitField0_; - // optional string serverAddress = 1; - public static final int SERVERADDRESS_FIELD_NUMBER = 1; - private java.lang.Object serverAddress_; + // optional string groupUrl = 1; + public static final int GROUPURL_FIELD_NUMBER = 1; + private java.lang.Object groupUrl_; /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public boolean hasServerAddress() { + public boolean hasGroupUrl() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public java.lang.String getServerAddress() { - java.lang.Object ref = serverAddress_; + public java.lang.String getGroupUrl() { + java.lang.Object ref = groupUrl_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { @@ -13122,58 +13107,42 @@ public final class SignalServiceProtos { (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { - serverAddress_ = s; + groupUrl_ = s; } return s; } } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ public com.google.protobuf.ByteString - getServerAddressBytes() { - java.lang.Object ref = serverAddress_; + getGroupUrlBytes() { + java.lang.Object ref = groupUrl_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - serverAddress_ = b; + groupUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - // optional uint32 channelId = 2; - public static final int CHANNELID_FIELD_NUMBER = 2; - private int channelId_; + // optional string groupName = 2; + public static final int GROUPNAME_FIELD_NUMBER = 2; + private java.lang.Object groupName_; /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - public boolean hasChannelId() { + public boolean hasGroupName() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - public int getChannelId() { - return channelId_; - } - - // optional string serverName = 3; - public static final int SERVERNAME_FIELD_NUMBER = 3; - private java.lang.Object serverName_; - /** - * optional string serverName = 3; - */ - public boolean hasServerName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string serverName = 3; - */ - public java.lang.String getServerName() { - java.lang.Object ref = serverName_; + public java.lang.String getGroupName() { + java.lang.Object ref = groupName_; if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { @@ -13181,22 +13150,22 @@ public final class SignalServiceProtos { (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); if (bs.isValidUtf8()) { - serverName_ = s; + groupName_ = s; } return s; } } /** - * optional string serverName = 3; + * optional string groupName = 2; */ public com.google.protobuf.ByteString - getServerNameBytes() { - java.lang.Object ref = serverName_; + getGroupNameBytes() { + java.lang.Object ref = groupName_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - serverName_ = b; + groupName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; @@ -13204,9 +13173,8 @@ public final class SignalServiceProtos { } private void initFields() { - serverAddress_ = ""; - channelId_ = 0; - serverName_ = ""; + groupUrl_ = ""; + groupName_ = ""; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -13221,13 +13189,10 @@ public final class SignalServiceProtos { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getServerAddressBytes()); + output.writeBytes(1, getGroupUrlBytes()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeUInt32(2, channelId_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBytes(3, getServerNameBytes()); + output.writeBytes(2, getGroupNameBytes()); } getUnknownFields().writeTo(output); } @@ -13240,15 +13205,11 @@ public final class SignalServiceProtos { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getServerAddressBytes()); + .computeBytesSize(1, getGroupUrlBytes()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(2, channelId_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(3, getServerNameBytes()); + .computeBytesSize(2, getGroupNameBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -13366,12 +13327,10 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - serverAddress_ = ""; + groupUrl_ = ""; bitField0_ = (bitField0_ & ~0x00000001); - channelId_ = 0; + groupName_ = ""; bitField0_ = (bitField0_ & ~0x00000002); - serverName_ = ""; - bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -13403,15 +13362,11 @@ public final class SignalServiceProtos { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.serverAddress_ = serverAddress_; + result.groupUrl_ = groupUrl_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } - result.channelId_ = channelId_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.serverName_ = serverName_; + result.groupName_ = groupName_; result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -13428,17 +13383,14 @@ public final class SignalServiceProtos { 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.hasServerAddress()) { + if (other.hasGroupUrl()) { bitField0_ |= 0x00000001; - serverAddress_ = other.serverAddress_; + groupUrl_ = other.groupUrl_; onChanged(); } - if (other.hasChannelId()) { - setChannelId(other.getChannelId()); - } - if (other.hasServerName()) { - bitField0_ |= 0x00000004; - serverName_ = other.serverName_; + if (other.hasGroupName()) { + bitField0_ |= 0x00000002; + groupName_ = other.groupName_; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -13468,183 +13420,150 @@ public final class SignalServiceProtos { } private int bitField0_; - // optional string serverAddress = 1; - private java.lang.Object serverAddress_ = ""; + // optional string groupUrl = 1; + private java.lang.Object groupUrl_ = ""; /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public boolean hasServerAddress() { + public boolean hasGroupUrl() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public java.lang.String getServerAddress() { - java.lang.Object ref = serverAddress_; + public java.lang.String getGroupUrl() { + java.lang.Object ref = groupUrl_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) .toStringUtf8(); - serverAddress_ = s; + groupUrl_ = s; return s; } else { return (java.lang.String) ref; } } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ public com.google.protobuf.ByteString - getServerAddressBytes() { - java.lang.Object ref = serverAddress_; + getGroupUrlBytes() { + java.lang.Object ref = groupUrl_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - serverAddress_ = b; + groupUrl_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public Builder setServerAddress( + public Builder setGroupUrl( java.lang.String value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000001; - serverAddress_ = value; + groupUrl_ = value; onChanged(); return this; } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public Builder clearServerAddress() { + public Builder clearGroupUrl() { bitField0_ = (bitField0_ & ~0x00000001); - serverAddress_ = getDefaultInstance().getServerAddress(); + groupUrl_ = getDefaultInstance().getGroupUrl(); onChanged(); return this; } /** - * optional string serverAddress = 1; + * optional string groupUrl = 1; */ - public Builder setServerAddressBytes( + public Builder setGroupUrlBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000001; - serverAddress_ = value; + groupUrl_ = value; onChanged(); return this; } - // optional uint32 channelId = 2; - private int channelId_ ; + // optional string groupName = 2; + private java.lang.Object groupName_ = ""; /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - public boolean hasChannelId() { + public boolean hasGroupName() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * optional uint32 channelId = 2; + * optional string groupName = 2; */ - public int getChannelId() { - return channelId_; - } - /** - * optional uint32 channelId = 2; - */ - public Builder setChannelId(int value) { - bitField0_ |= 0x00000002; - channelId_ = value; - onChanged(); - return this; - } - /** - * optional uint32 channelId = 2; - */ - public Builder clearChannelId() { - bitField0_ = (bitField0_ & ~0x00000002); - channelId_ = 0; - onChanged(); - return this; - } - - // optional string serverName = 3; - private java.lang.Object serverName_ = ""; - /** - * optional string serverName = 3; - */ - public boolean hasServerName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional string serverName = 3; - */ - public java.lang.String getServerName() { - java.lang.Object ref = serverName_; + public java.lang.String getGroupName() { + java.lang.Object ref = groupName_; if (!(ref instanceof java.lang.String)) { java.lang.String s = ((com.google.protobuf.ByteString) ref) .toStringUtf8(); - serverName_ = s; + groupName_ = s; return s; } else { return (java.lang.String) ref; } } /** - * optional string serverName = 3; + * optional string groupName = 2; */ public com.google.protobuf.ByteString - getServerNameBytes() { - java.lang.Object ref = serverName_; + getGroupNameBytes() { + java.lang.Object ref = groupName_; if (ref instanceof String) { com.google.protobuf.ByteString b = com.google.protobuf.ByteString.copyFromUtf8( (java.lang.String) ref); - serverName_ = b; + groupName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } /** - * optional string serverName = 3; + * optional string groupName = 2; */ - public Builder setServerName( + public Builder setGroupName( java.lang.String value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000004; - serverName_ = value; + bitField0_ |= 0x00000002; + groupName_ = value; onChanged(); return this; } /** - * optional string serverName = 3; + * optional string groupName = 2; */ - public Builder clearServerName() { - bitField0_ = (bitField0_ & ~0x00000004); - serverName_ = getDefaultInstance().getServerName(); + public Builder clearGroupName() { + bitField0_ = (bitField0_ & ~0x00000002); + groupName_ = getDefaultInstance().getGroupName(); onChanged(); return this; } /** - * optional string serverName = 3; + * optional string groupName = 2; */ - public Builder setServerNameBytes( + public Builder setGroupNameBytes( com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000004; - serverName_ = value; + bitField0_ |= 0x00000002; + groupName_ = value; onChanged(); 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" + "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" + - "TION_TIMER_UPDATE\020\002\"S\n\023OpenGroupInvitati", - "on\022\025\n\rserverAddress\030\001 \001(\t\022\021\n\tchannelId\030\002" + - " \001(\r\022\022\n\nserverName\030\003 \001(\t\"\316\003\n\024Configurati" + - "onMessage\022E\n\014closedGroups\030\001 \003(\0132/.signal" + - "service.ConfigurationMessage.ClosedGroup" + - "\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 \001(" + - "\t\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKey\030" + - "\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+.signalservice." + - "ConfigurationMessage.Contact\032\202\001\n\013ClosedG" + - "roup\022\021\n\tpublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n" + - "\021encryptionKeyPair\030\003 \001(\0132\026.signalservice", - ".KeyPair\022\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(" + - "\014\032V\n\007Contact\022\021\n\tpublicKey\030\001 \002(\014\022\014\n\004name\030" + - "\002 \002(\t\022\026\n\016profilePicture\030\003 \001(\t\022\022\n\nprofile" + - "Key\030\004 \001(\014\"u\n\016ReceiptMessage\0220\n\004type\030\001 \002(" + - "\0162\".signalservice.ReceiptMessage.Type\022\021\n" + - "\ttimestamp\030\002 \003(\004\"\036\n\004Type\022\014\n\010DELIVERY\020\000\022\010" + - "\n\004READ\020\001\"\354\001\n\021AttachmentPointer\022\n\n\002id\030\001 \002" + - "(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004" + - "size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006digest\030" + - "\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r", - "\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007caption" + - "\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rVOICE_ME" + - "SSAGE\020\001\"\365\001\n\014GroupContext\022\n\n\002id\030\001 \001(\014\022.\n\004" + - "type\030\002 \001(\0162 .signalservice.GroupContext." + - "Type\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003(\t\0220\n\006a" + - "vatar\030\005 \001(\0132 .signalservice.AttachmentPo" + - "inter\022\016\n\006admins\030\006 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN" + - "\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n" + - "\014REQUEST_INFO\020\004BB\n+org.session.libsignal" + - ".service.internal.pushB\023SignalServicePro", - "tos" + "TION_TIMER_UPDATE\020\002\":\n\023OpenGroupInvitati", + "on\022\020\n\010groupUrl\030\001 \001(\t\022\021\n\tgroupName\030\002 \001(\t\"" + + "\316\003\n\024ConfigurationMessage\022E\n\014closedGroups" + + "\030\001 \003(\0132/.signalservice.ConfigurationMess" + + "age.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013d" + + "isplayName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001(\t" + + "\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+" + + ".signalservice.ConfigurationMessage.Cont" + + "act\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014" + + "\n\004name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\0132" + + "\026.signalservice.KeyPair\022\017\n\007members\030\004 \003(\014", + "\022\016\n\006admins\030\005 \003(\014\032V\n\007Contact\022\021\n\tpublicKey" + + "\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003" + + " \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMessa" + + "ge\0220\n\004type\030\001 \002(\0162\".signalservice.Receipt" + + "Message.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Type\022" + + "\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021AttachmentPo" + + "inter\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t\022\013" + + "\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005" + + " \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r" + + "\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n", + " \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Fl" + + "ags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContext\022" + + "\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalservic" + + "e.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007mem" + + "bers\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalservi" + + "ce.AttachmentPointer\022\016\n\006admins\030\006 \003(\t\"H\n\004" + + "Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER" + + "\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org.se" + + "ssion.libsignal.service.internal.pushB\023S" + + "ignalServiceProtos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -21317,7 +21235,7 @@ public final class SignalServiceProtos { internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_OpenGroupInvitation_descriptor, - new java.lang.String[] { "ServerAddress", "ChannelId", "ServerName", }); + new java.lang.String[] { "GroupUrl", "GroupName", }); internal_static_signalservice_ConfigurationMessage_descriptor = getDescriptor().getMessageTypes().get(7); internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new From b2a924ebf85253e1855c78d1262b1759a839c1ba Mon Sep 17 00:00:00 2001 From: Brice-W Date: Wed, 12 May 2021 08:40:10 +1000 Subject: [PATCH 06/29] views created + database storage --- .../conversation/ConversationAdapter.java | 25 +- .../conversation/ConversationItem.java | 36 +- .../securesms/database/MmsSmsColumns.java | 10 +- .../securesms/database/SmsDatabase.java | 9 +- .../securesms/database/Storage.kt | 14 +- .../database/model/DisplayRecord.java | 6 + .../database/model/MessageRecord.java | 14 +- .../loki/activities/JoinPublicChatActivity.kt | 2 +- .../loki/views/OpenGroupInvitationView.kt | 58 + .../res/layout/conversation_item_received.xml | 6 + ...on_item_received_open_group_invitation.xml | 10 + .../res/layout/conversation_item_sent.xml | 10 +- ...sation_item_sent_open_group_invitation.xml | 10 + .../res/layout/open_group_invitation_view.xml | 73 + app/src/main/res/values-fr/strings.xml | 3 + app/src/main/res/values/strings.xml | 4 + .../messages/control/OpenGroupInvitation.kt | 46 - .../messages/signal/IncomingTextMessage.java | 17 + .../messages/signal/OutgoingTextMessage.java | 13 + .../messages/visible/OpenGroupInvitation.kt | 43 + .../messages/visible/VisibleMessage.kt | 12 + .../ReceivedMessageHandler.kt | 9 +- ...sageBuilder.kt => UpdateMessageBuilder.kt} | 14 +- ...ateMessageData.kt => UpdateMessageData.kt} | 30 +- .../utilities/OpenGroupUrlParser.kt | 29 +- .../utilities/OpenGroupUrlParserTest.kt | 36 +- libsignal/protobuf/SignalService.proto | 15 +- .../internal/push/SignalServiceProtos.java | 1992 +++++++++-------- 28 files changed, 1484 insertions(+), 1062 deletions(-) create mode 100644 app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt create mode 100644 app/src/main/res/layout/conversation_item_received_open_group_invitation.xml create mode 100644 app/src/main/res/layout/conversation_item_sent_open_group_invitation.xml create mode 100644 app/src/main/res/layout/open_group_invitation_view.xml delete mode 100644 libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt create mode 100644 libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt rename libsession/src/main/java/org/session/libsession/messaging/utilities/{ClosedGroupUpdateMessageBuilder.kt => UpdateMessageBuilder.kt} (91%) rename libsession/src/main/java/org/session/libsession/messaging/utilities/{ClosedGroupUpdateMessageData.kt => UpdateMessageData.kt} (64%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index ba7f4bcac3..f2b2d38b70 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -87,15 +87,17 @@ public class ConversationAdapter Collections.synchronizedMap(new LRUCache>(MAX_CACHE_SIZE)); private final SparseArray positionToCacheRef = new SparseArray<>(); - private static final int MESSAGE_TYPE_OUTGOING = 0; - private static final int MESSAGE_TYPE_INCOMING = 1; - private static final int MESSAGE_TYPE_UPDATE = 2; - private static final int MESSAGE_TYPE_AUDIO_OUTGOING = 3; - private static final int MESSAGE_TYPE_AUDIO_INCOMING = 4; - private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5; - private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6; - private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING = 7; - private static final int MESSAGE_TYPE_DOCUMENT_INCOMING = 8; + private static final int MESSAGE_TYPE_OUTGOING = 0; + private static final int MESSAGE_TYPE_INCOMING = 1; + private static final int MESSAGE_TYPE_UPDATE = 2; + private static final int MESSAGE_TYPE_AUDIO_OUTGOING = 3; + private static final int MESSAGE_TYPE_AUDIO_INCOMING = 4; + private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5; + private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6; + private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING = 7; + private static final int MESSAGE_TYPE_DOCUMENT_INCOMING = 8; + private static final int MESSAGE_TYPE_INVITATION_OUTGOING = 9; + private static final int MESSAGE_TYPE_INVITATION_INCOMING = 10; private final Set batchSelected = Collections.synchronizedSet(new HashSet()); @@ -281,10 +283,12 @@ public class ConversationAdapter case MESSAGE_TYPE_AUDIO_OUTGOING: case MESSAGE_TYPE_THUMBNAIL_OUTGOING: case MESSAGE_TYPE_DOCUMENT_OUTGOING: + case MESSAGE_TYPE_INVITATION_OUTGOING: case MESSAGE_TYPE_OUTGOING: return R.layout.conversation_item_sent; case MESSAGE_TYPE_AUDIO_INCOMING: case MESSAGE_TYPE_THUMBNAIL_INCOMING: case MESSAGE_TYPE_DOCUMENT_INCOMING: + case MESSAGE_TYPE_INVITATION_INCOMING: case MESSAGE_TYPE_INCOMING: return R.layout.conversation_item_received; case MESSAGE_TYPE_UPDATE: return R.layout.conversation_item_update; default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter"); @@ -295,6 +299,9 @@ public class ConversationAdapter public int getItemViewType(@NonNull MessageRecord messageRecord) { if (messageRecord.isUpdate()) { return MESSAGE_TYPE_UPDATE; + } else if (messageRecord.isOpenGroupInvitation()) { + if (messageRecord.isOutgoing()) return MESSAGE_TYPE_INVITATION_OUTGOING; + else return MESSAGE_TYPE_INVITATION_INCOMING; } else if (hasAudio(messageRecord)) { if (messageRecord.isOutgoing()) return MESSAGE_TYPE_AUDIO_OUTGOING; else return MESSAGE_TYPE_AUDIO_INCOMING; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index b89a7b6962..472a4e5bd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -63,7 +63,9 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; +import org.session.libsession.utilities.OpenGroupUrlParser; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.Util; @@ -92,6 +94,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities; import org.thoughtcrime.securesms.loki.views.MessageAudioView; +import org.thoughtcrime.securesms.loki.views.OpenGroupInvitationView; import org.thoughtcrime.securesms.loki.views.ProfilePictureView; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.ImageSlide; @@ -156,6 +159,7 @@ public class ConversationItem extends LinearLayout private Stub documentViewStub; private Stub linkPreviewStub; private Stub stickerStub; + private Stub openGroupInvitationViewStub; private @Nullable EventListener eventListener; private int defaultBubbleColor; @@ -203,6 +207,7 @@ public class ConversationItem extends LinearLayout this.documentViewStub = new Stub<>(findViewById(R.id.document_view_stub)); this.linkPreviewStub = new Stub<>(findViewById(R.id.link_preview_stub)); this.stickerStub = new Stub<>(findViewById(R.id.sticker_view_stub)); + this.openGroupInvitationViewStub = new Stub<>(findViewById(R.id.open_group_invitation_stub)); this.groupSenderHolder = findViewById(R.id.group_sender_holder); this.quoteView = findViewById(R.id.quote_view); this.container = findViewById(R.id.container); @@ -467,7 +472,9 @@ public class ConversationItem extends LinearLayout bodyText.setOverflowText(null); } - bodyText.setText(text); + if (!messageRecord.isOpenGroupInvitation()) + bodyText.setText(text); + bodyText.setVisibility(View.VISIBLE); } } @@ -528,6 +535,7 @@ public class ConversationItem extends LinearLayout if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE); if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); + if (openGroupInvitationViewStub.resolved()) openGroupInvitationViewStub.get().setVisibility(View.GONE); //noinspection ConstantConditions LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0); @@ -564,6 +572,7 @@ public class ConversationItem extends LinearLayout if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE); if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE); if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); + if (openGroupInvitationViewStub.resolved()) openGroupInvitationViewStub.get().setVisibility(View.GONE); //noinspection ConstantConditions audioViewStub.get().setAudio(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getAudioSlide(), showControls); @@ -580,6 +589,7 @@ public class ConversationItem extends LinearLayout if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE); if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); + if (openGroupInvitationViewStub.resolved()) openGroupInvitationViewStub.get().setVisibility(View.GONE); //noinspection ConstantConditions documentViewStub.get().setDocument(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getDocumentSlide(), showControls); @@ -597,6 +607,7 @@ public class ConversationItem extends LinearLayout if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE); if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE); if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); + if (openGroupInvitationViewStub.resolved()) openGroupInvitationViewStub.get().setVisibility(View.GONE); //noinspection ConstantConditions List thumbnailSlides = ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlides(); @@ -619,6 +630,29 @@ public class ConversationItem extends LinearLayout ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); footer.setVisibility(VISIBLE); + } else if (messageRecord.isOpenGroupInvitation()) { + openGroupInvitationViewStub.get().setVisibility(View.VISIBLE); + if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); + if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); + if (documentViewStub.resolved()) documentViewStub.get().setVisibility(View.GONE); + if (linkPreviewStub.resolved()) linkPreviewStub.get().setVisibility(GONE); + if (stickerStub.resolved()) stickerStub.get().setVisibility(View.GONE); + + UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(messageRecord.getBody()); + String name = null, url = null; + if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) { + UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind(); + name = data.getGroupName(); + url = OpenGroupUrlParser.INSTANCE.trimParameter(data.getGroupUrl()); + } + + openGroupInvitationViewStub.get().setOpenGroup(name, url, messageRecord.isOutgoing()); + openGroupInvitationViewStub.get().setOnLongClickListener(passthroughClickListener); + + bodyText.setVisibility(View.GONE); + + ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); } else { if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE); if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java index 024d1f51dd..3826c28faf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java @@ -47,13 +47,15 @@ public interface MmsSmsColumns { BASE_PENDING_INSECURE_SMS_FALLBACK, OUTGOING_CALL_TYPE}; + + //TODO clean unused keys // Message attributes protected static final long MESSAGE_FORCE_SMS_BIT = 0x40; // Key Exchange Information protected static final long KEY_EXCHANGE_MASK = 0xFF00; protected static final long KEY_EXCHANGE_BIT = 0x8000; - protected static final long KEY_EXCHANGE_IDENTITY_VERIFIED_BIT = 0x4000; + protected static final long KEY_EXCHANGE_IDENTITY_VERIFIED_BIT = 0x40000; protected static final long KEY_EXCHANGE_IDENTITY_DEFAULT_BIT = 0x2000; protected static final long KEY_EXCHANGE_CORRUPTED_BIT = 0x1000; protected static final long KEY_EXCHANGE_INVALID_VERSION_BIT = 0x800; @@ -75,6 +77,8 @@ public interface MmsSmsColumns { // Data Extraction Information protected static final long MEDIA_SAVED_EXTRACTION_BIT = 0x01000; protected static final long SCREENSHOT_EXTRACTION_BIT = 0x02000; + // Open Group Invitation + protected static final long OPEN_GROUP_INVITATION_BIT = 0x04000; // Encrypted Storage Information XXX public static final long ENCRYPTION_MASK = 0xFF000000; @@ -210,6 +214,10 @@ public interface MmsSmsColumns { return (type & SCREENSHOT_EXTRACTION_BIT) != 0; } + public static boolean isOpenGroupInvitation(long type) { + return (type & OPEN_GROUP_INVITATION_BIT) != 0; + } + public static boolean isIncomingCall(long type) { return type == INCOMING_CALL_TYPE; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 226645b39c..1da23548da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -350,7 +350,9 @@ public class SmsDatabase extends MessagingDatabase { if (((IncomingGroupMessage)message).isUpdateMessage()) type |= Types.GROUP_UPDATE_MESSAGE_BIT; } - if (message.isPush()) type |= Types.PUSH_MESSAGE_BIT; + if (message.isPush()) type |= Types.PUSH_MESSAGE_BIT; + + if (message.isOpenGroupInvitation()) type |= Types.OPEN_GROUP_INVITATION_BIT; Recipient recipient = Recipient.from(context, message.getSender(), true); @@ -443,8 +445,9 @@ public class SmsDatabase extends MessagingDatabase { { long type = Types.BASE_SENDING_TYPE; - if (message.isSecureMessage()) type |= (Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_BIT); - if (forceSms) type |= Types.MESSAGE_FORCE_SMS_BIT; + if (message.isSecureMessage()) type |= (Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_BIT); + if (forceSms) type |= Types.MESSAGE_FORCE_SMS_BIT; + if (message.isOpenGroupInvitation()) type |= Types.OPEN_GROUP_INVITATION_BIT; Address address = message.getRecipient().getAddress(); Map earlyDeliveryReceipts = earlyDeliveryReceiptCache.remove(date); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 0f449c9f3a..2f014dd90d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -24,7 +24,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address.Companion.fromSerialized import org.session.libsession.messaging.threads.GroupRecord import org.session.libsession.messaging.threads.recipients.Recipient -import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageData +import org.session.libsession.messaging.utilities.UpdateMessageData import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences @@ -165,11 +165,15 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, mmsDatabase.endTransaction() } else { val smsDatabase = DatabaseFactory.getSmsDatabase(context) + val isOpenGroupInvitation = message.openGroupInvitation != null + val insertResult = if (message.sender == getUserPublicKey()) { - val textMessage = OutgoingTextMessage.from(message, targetRecipient) + val textMessage = if (isOpenGroupInvitation) OutgoingTextMessage.fromOpenGroupInvitation(message.openGroupInvitation, targetRecipient, message.sentTimestamp) + else OutgoingTextMessage.from(message, targetRecipient) smsDatabase.insertMessageOutbox(message.threadID ?: -1, textMessage, message.sentTimestamp!!) } else { - val textMessage = IncomingTextMessage.from(message, senderAddress, group, targetRecipient.expireMessages * 1000L) + val textMessage = if (isOpenGroupInvitation) IncomingTextMessage.fromOpenGroupInvitation(message.openGroupInvitation, senderAddress, message.sentTimestamp) + else IncomingTextMessage.from(message, senderAddress, group, targetRecipient.expireMessages * 1000L) val encrypted = IncomingEncryptedMessage(textMessage, textMessage.messageBody) smsDatabase.insertMessageInbox(encrypted, message.receivedTimestamp ?: 0) } @@ -475,7 +479,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, override fun insertIncomingInfoMessage(context: Context, senderPublicKey: String, groupID: String, type: SignalServiceGroup.Type, name: String, members: Collection, admins: Collection, sentTimestamp: Long) { val group = SignalServiceGroup(type, GroupUtil.getDecodedGroupIDAsData(groupID), SignalServiceGroup.GroupType.SIGNAL, name, members.toList(), null, admins.toList()) val m = IncomingTextMessage(Address.fromSerialized(senderPublicKey), 1, sentTimestamp, "", Optional.of(group), 0, true) - val updateData = ClosedGroupUpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() + val updateData = UpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() val infoMessage = IncomingGroupMessage(m, groupID, updateData, true) val smsDB = DatabaseFactory.getSmsDatabase(context) smsDB.insertMessageInbox(infoMessage) @@ -485,7 +489,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, val userPublicKey = getUserPublicKey() val recipient = Recipient.from(context, Address.fromSerialized(groupID), false) - val updateData = ClosedGroupUpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() ?: "" + val updateData = UpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() ?: "" val infoMessage = OutgoingGroupMediaMessage(recipient, updateData, groupID, null, sentTimestamp, 0, true, null, listOf(), listOf()) val mmsDB = DatabaseFactory.getMmsDatabase(context) val mmsSmsDB = DatabaseFactory.getMmsSmsDatabase(context) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java index f98dcda5d9..21d69d4770 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java @@ -145,6 +145,12 @@ public abstract class DisplayRecord { return isMediaSavedExtraction() || isScreenshotExtraction(); } + // Open Group Invitation + + public boolean isOpenGroupInvitation() { + return MmsSmsColumns.Types.isOpenGroupInvitation(type); + } + public boolean isCallLog() { return SmsDatabase.Types.isCallLog(type); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java index 8380c41633..441b6cb988 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -26,8 +26,8 @@ import android.text.style.StyleSpan; import network.loki.messenger.R; import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage; -import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageBuilder; -import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageData; +import org.session.libsession.messaging.utilities.UpdateMessageBuilder; +import org.session.libsession.messaging.utilities.UpdateMessageData; import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SmsDatabase; import org.session.libsession.database.documents.IdentityKeyMismatch; @@ -93,14 +93,14 @@ public abstract class MessageRecord extends DisplayRecord { @Override public SpannableString getDisplayBody(@NonNull Context context) { if(isGroupUpdateMessage()) { - ClosedGroupUpdateMessageData updateMessageData = ClosedGroupUpdateMessageData.Companion.fromJSON(getBody()); - return new SpannableString(ClosedGroupUpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing())); + UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody()); + return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing())); } else if (isExpirationTimerUpdate()) { int seconds = (int) (getExpiresIn() / 1000); - return new SpannableString(ClosedGroupUpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getIndividualRecipient().getAddress().serialize(), isOutgoing())); + return new SpannableString(UpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getIndividualRecipient().getAddress().serialize(), isOutgoing())); } else if (isDataExtraction()) { - if (isScreenshotExtraction()) return new SpannableString((ClosedGroupUpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize()))); - else if (isMediaSavedExtraction()) return new SpannableString((ClosedGroupUpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize()))); + if (isScreenshotExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize()))); + else if (isMediaSavedExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize()))); } // TODO below lines are left here for compatibility with older group update messages, it can be deleted later on else if (isGroupUpdate() && isOutgoing()) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt index 6686ca8345..9e8a94fed6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt @@ -121,7 +121,7 @@ class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCode } } catch (e: Exception) { - Log.e("JoinPublicChatActivity", "Fialed to join open group.", e) + Log.e("JoinPublicChatActivity", "Failed to join open group.", e) withContext(Dispatchers.Main) { hideLoader() Toast.makeText(this@JoinPublicChatActivity, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt new file mode 100644 index 0000000000..fe3b9c0155 --- /dev/null +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -0,0 +1,58 @@ +package org.thoughtcrime.securesms.loki.views + +import android.content.Context +import android.graphics.Color +import android.util.AttributeSet +import android.view.View +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.TextView +import androidx.core.content.ContextCompat +import network.loki.messenger.R +import org.session.libsignal.utilities.logging.Log +import java.io.IOException + +class OpenGroupInvitationView : FrameLayout { + + companion object { + private const val TAG = "OpenGroupInvitationView" + } + + private val joinButton: ImageView + private val openGroupIcon: ImageView + private val groupName: TextView + private val groupUrl: TextView + + constructor(context: Context): this(context, null) + + constructor(context: Context, attrs: AttributeSet?): this(context, attrs, 0) + + constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int): super(context, attrs, defStyleAttr) { + View.inflate(context, R.layout.open_group_invitation_view, this) + joinButton = findViewById(R.id.join_open_group) + openGroupIcon = findViewById(R.id.open_group_icon) + groupName = findViewById(R.id.group_name) + groupUrl = findViewById(R.id.group_url) + + joinButton.setOnClickListener { } + } + + fun setOpenGroup(name: String, url: String, isOutgoing: Boolean = false) { + groupName.text = name + groupUrl.text = url + + if(isOutgoing) { + joinButton.visibility = View.GONE + openGroupIcon.visibility = View.VISIBLE + } else { + joinButton.visibility = View.VISIBLE + openGroupIcon.visibility = View.GONE + } + } + + fun joinPublicGroup(url: String) { + + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/conversation_item_received.xml b/app/src/main/res/layout/conversation_item_received.xml index f0c853828c..ade3ea2c78 100644 --- a/app/src/main/res/layout/conversation_item_received.xml +++ b/app/src/main/res/layout/conversation_item_received.xml @@ -140,6 +140,12 @@ android:layout_height="wrap_content" android:layout="@layout/conversation_item_received_link_preview" /> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/conversation_item_sent.xml b/app/src/main/res/layout/conversation_item_sent.xml index 9dc10706b1..b6a7ff291a 100644 --- a/app/src/main/res/layout/conversation_item_sent.xml +++ b/app/src/main/res/layout/conversation_item_sent.xml @@ -50,13 +50,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/large_spacing" - android:layout_marginBottom="@dimen/medium_spacing" android:layout_marginEnd="@dimen/large_spacing" + android:layout_marginBottom="@dimen/medium_spacing" android:visibility="gone" app:message_type="outgoing" app:quote_colorPrimary="@color/text" app:quote_colorSecondary="@color/text" - tools:visibility="visible"/> + tools:visibility="visible" /> + + + \ No newline at end of file diff --git a/app/src/main/res/layout/open_group_invitation_view.xml b/app/src/main/res/layout/open_group_invitation_view.xml new file mode 100644 index 0000000000..b70dd8dd2c --- /dev/null +++ b/app/src/main/res/layout/open_group_invitation_view.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5fbc37a757..b4c1cdcd1e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -782,6 +782,9 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i Lire Mettre en pause Télécharger + + Rejoindre + Invitation à un groupe public Contenu audio Vidéo diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 83997f2bdf..0b5a6f20f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -948,6 +948,10 @@ Pause Download + + Join + Open group invitation + Audio Video diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt deleted file mode 100644 index bbb3653719..0000000000 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/OpenGroupInvitation.kt +++ /dev/null @@ -1,46 +0,0 @@ -package org.session.libsession.messaging.messages.control - -import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log - -class OpenGroupInvitation() : ControlMessage() { - - var groupUrl: String? = null; - var groupName: String? = null; - - companion object { - const val TAG = "OpenGroupInvitation" - - fun fromProto(proto: SignalServiceProtos.Content): OpenGroupInvitation? { - val openGroupInvitationProto = if (proto.hasOpenGroupInvitation()) proto.openGroupInvitation else return null - val serverAddress = openGroupInvitationProto.groupUrl - val serverName = openGroupInvitationProto.groupName - return OpenGroupInvitation(serverAddress, serverName) - } - } - - constructor(url: String?, serverName: String?): this() { - this.groupUrl = url - this.groupName = serverName - } - - override fun isValid(): Boolean { - if (!super.isValid()) return false - return (groupUrl != null && groupName != null) - } - - override fun toProto(): SignalServiceProtos.Content? { - val openGroupInvitationProto = SignalServiceProtos.OpenGroupInvitation.newBuilder() - openGroupInvitationProto.groupUrl = groupUrl - openGroupInvitationProto.groupName = groupName - - val proto = SignalServiceProtos.Content.newBuilder() - return try { - proto.openGroupInvitation = openGroupInvitationProto.build() - proto.build() - } catch (e: Exception) { - Log.w(TAG, "Couldn't construct open group invitation proto from: $this") - null - } - } -} \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 35b9d40a2c..6cd5a45cac 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -5,11 +5,14 @@ import android.os.Parcelable; import androidx.annotation.Nullable; +import org.session.libsession.messaging.messages.visible.OpenGroupInvitation; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.Address; +import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.utilities.logging.Log; public class IncomingTextMessage implements Parcelable { @@ -40,6 +43,8 @@ public class IncomingTextMessage implements Parcelable { private final long expiresInMillis; private final boolean unidentified; + private boolean isOpenGroupInvitation = false; + public IncomingTextMessage(Address sender, int senderDeviceId, long sentTimestampMillis, String encodedBody, Optional group, long expiresInMillis, boolean unidentified) @@ -94,6 +99,7 @@ public class IncomingTextMessage implements Parcelable { this.subscriptionId = base.getSubscriptionId(); this.expiresInMillis = base.getExpiresIn(); this.unidentified = base.isUnidentified(); + this.isOpenGroupInvitation= base.isOpenGroupInvitation(); } public static IncomingTextMessage from(VisibleMessage message, @@ -104,6 +110,14 @@ public class IncomingTextMessage implements Parcelable { return new IncomingTextMessage(sender, 1, message.getSentTimestamp(), message.getText(), group, expiresInMillis, false); } + public static IncomingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Address sender, Long sentTimestamp) + { + String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON(); + IncomingTextMessage incomingTextMessage = new IncomingTextMessage(sender, 1, sentTimestamp, body, Optional.absent(), 0, false); + incomingTextMessage.isOpenGroupInvitation = true; + return incomingTextMessage; + } + public int getSubscriptionId() { return subscriptionId; } @@ -163,6 +177,9 @@ public class IncomingTextMessage implements Parcelable { public boolean isUnidentified() { return unidentified; } + + public boolean isOpenGroupInvitation() { return isOpenGroupInvitation; } + @Override public int describeContents() { return 0; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java index 9ebd44891e..c56c61ba6b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java @@ -1,7 +1,9 @@ package org.session.libsession.messaging.messages.signal; +import org.session.libsession.messaging.messages.visible.OpenGroupInvitation; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.messaging.utilities.UpdateMessageData; public class OutgoingTextMessage { @@ -11,6 +13,8 @@ public class OutgoingTextMessage { private final long expiresIn; private final long sentTimestampMillis; + private boolean isOpenGroupInvitation = false; + public OutgoingTextMessage(Recipient recipient, String message, long expiresIn, int subscriptionId, long sentTimestampMillis) { this.recipient = recipient; this.message = message; @@ -23,6 +27,13 @@ public class OutgoingTextMessage { return new OutgoingTextMessage(recipient, message.getText(), recipient.getExpireMessages() * 1000, -1, message.getSentTimestamp()); } + public static OutgoingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Recipient recipient, Long sentTimestamp) { + String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON(); + OutgoingTextMessage outgoingTextMessage = new OutgoingTextMessage(recipient, body, 0, -1, sentTimestamp); + outgoingTextMessage.isOpenGroupInvitation = true; + return outgoingTextMessage; + } + public long getExpiresIn() { return expiresIn; } @@ -46,4 +57,6 @@ public class OutgoingTextMessage { public boolean isSecureMessage() { return true; } + + public boolean isOpenGroupInvitation() { return isOpenGroupInvitation; } } diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt new file mode 100644 index 0000000000..9896aec836 --- /dev/null +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -0,0 +1,43 @@ +package org.session.libsession.messaging.messages.visible + +import org.session.libsession.messaging.messages.control.ControlMessage +import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.utilities.logging.Log + +class OpenGroupInvitation() { + + var groupUrl: String? = null; + var groupName: String? = null; + + companion object { + const val TAG = "OpenGroupInvitation" + + fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation? { + val groupUrl = proto.url + val groupName = proto.name + return OpenGroupInvitation(groupUrl, groupName) + } + } + + constructor(url: String?, serverName: String?): this() { + this.groupUrl = url + this.groupName = serverName + } + + fun isValid(): Boolean { + return (groupUrl != null && groupName != null) + } + + fun toProto(): SignalServiceProtos.DataMessage.OpenGroupInvitation? { + val openGroupInvitationProto = SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() + openGroupInvitationProto.url = groupUrl + openGroupInvitationProto.name = groupName + + return try { + openGroupInvitationProto.build() + } catch (e: Exception) { + Log.w(TAG, "Couldn't construct open group invitation proto from: $this") + null + } + } +} \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 63756c0948..5452ba7b51 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -18,6 +18,7 @@ class VisibleMessage : Message() { var quote: Quote? = null var linkPreview: LinkPreview? = null var profile: Profile? = null + var openGroupInvitation: OpenGroupInvitation? = null override val isSelfSendValid: Boolean = true @@ -42,6 +43,11 @@ class VisibleMessage : Message() { val linkPreview = LinkPreview.fromProto(linkPreviewProto) linkPreview?.let { result.linkPreview = linkPreview } } + val openGroupInvitationProto = if (dataMessage.hasOpenGroupInvitation()) dataMessage.openGroupInvitation else null + openGroupInvitationProto?.let { + val openGroupInvitation = OpenGroupInvitation.fromProto(openGroupInvitationProto) + openGroupInvitation?.let { result.openGroupInvitation = openGroupInvitation} + } // TODO Contact val profile = Profile.fromProto(dataMessage) profile?.let { result.profile = profile } @@ -66,6 +72,7 @@ class VisibleMessage : Message() { if (attachmentIDs.isNotEmpty()) return true val text = text?.trim() ?: return false if (text.isNotEmpty()) return true + if (openGroupInvitation != null) return true return false } @@ -94,6 +101,11 @@ class VisibleMessage : Message() { dataMessage.addAllPreview(listOf(linkPreviewProto)) } } + //Open group invitation + openGroupInvitation?.let { + val openGroupInvitationProto = it.toProto() + if (openGroupInvitationProto != null) dataMessage.openGroupInvitation = openGroupInvitationProto + } //Attachments val attachments = attachmentIDs.mapNotNull { MessagingModuleConfiguration.shared.messageDataProvider.getSignalAttachmentPointer(it) } if (!attachments.all { !it.url.isNullOrEmpty() }) { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 7fada09958..2c3837f87a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -1,13 +1,13 @@ package org.session.libsession.messaging.sending_receiving import android.text.TextUtils -import okhttp3.HttpUrl import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.jobs.AttachmentDownloadJob import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.Attachment +import org.session.libsession.messaging.messages.visible.OpenGroupInvitation import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage @@ -49,7 +49,6 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content, is ExpirationTimerUpdate -> handleExpirationTimerUpdate(message) is DataExtractionNotification -> handleDataExtractionNotification(message) is ConfigurationMessage -> handleConfigurationMessage(message) - is OpenGroupInvitation -> handleOpenGroupInvitation(message) is VisibleMessage -> handleVisibleMessage(message, proto, openGroupID) } } @@ -150,12 +149,6 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) { storage.addContacts(message.contacts) } -// Open group invitation handling - -fun handleOpenGroupInvitation(message: OpenGroupInvitation) { - //TODO -} - //endregion //region VisibleMessage diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt similarity index 91% rename from libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageBuilder.kt rename to libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt index 33a6385692..04484f9cc8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageBuilder.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt @@ -6,9 +6,9 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage import org.session.libsession.utilities.ExpirationUtil -object ClosedGroupUpdateMessageBuilder { +object UpdateMessageBuilder { - fun buildGroupUpdateMessage(context: Context, updateMessageData: ClosedGroupUpdateMessageData, sender: String? = null, isOutgoing: Boolean = false): String { + fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, sender: String? = null, isOutgoing: Boolean = false): String { var message = "" val updateData = updateMessageData.kind ?: return message if (!isOutgoing && sender == null) return message @@ -17,21 +17,21 @@ object ClosedGroupUpdateMessageBuilder { } else { context.getString(R.string.MessageRecord_you) } when (updateData) { - is ClosedGroupUpdateMessageData.Kind.GroupCreation -> { + is UpdateMessageData.Kind.GroupCreation -> { message = if (isOutgoing) { context.getString(R.string.MessageRecord_you_created_a_new_group) } else { context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName) } } - is ClosedGroupUpdateMessageData.Kind.GroupNameChange -> { + is UpdateMessageData.Kind.GroupNameChange -> { message = if (isOutgoing) { context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.name) } else { context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.name) } } - is ClosedGroupUpdateMessageData.Kind.GroupMemberAdded -> { + is UpdateMessageData.Kind.GroupMemberAdded -> { val members = updateData.updatedMembers.joinToString(", ") { MessagingModuleConfiguration.shared.storage.getDisplayNameForRecipient(it) ?: it } @@ -41,7 +41,7 @@ object ClosedGroupUpdateMessageBuilder { context.getString(R.string.MessageRecord_s_added_s_to_the_group, senderName, members) } } - is ClosedGroupUpdateMessageData.Kind.GroupMemberRemoved -> { + is UpdateMessageData.Kind.GroupMemberRemoved -> { val storage = MessagingModuleConfiguration.shared.storage val userPublicKey = storage.getUserPublicKey()!! // 1st case: you are part of the removed members @@ -63,7 +63,7 @@ object ClosedGroupUpdateMessageBuilder { } } } - is ClosedGroupUpdateMessageData.Kind.GroupMemberLeft -> { + is UpdateMessageData.Kind.GroupMemberLeft -> { message = if (isOutgoing) { context.getString(R.string.MessageRecord_left_group) } else { diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageData.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt similarity index 64% rename from libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageData.kt rename to libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt index 47efd03a4c..062576ea6c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/ClosedGroupUpdateMessageData.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt @@ -9,7 +9,7 @@ import org.session.libsignal.utilities.logging.Log import java.util.* // class used to save update messages details -class ClosedGroupUpdateMessageData () { +class UpdateMessageData () { var kind: Kind? = null @@ -20,7 +20,8 @@ class ClosedGroupUpdateMessageData () { JsonSubTypes.Type(Kind.GroupNameChange::class, name = "GroupNameChange"), JsonSubTypes.Type(Kind.GroupMemberAdded::class, name = "GroupMemberAdded"), JsonSubTypes.Type(Kind.GroupMemberRemoved::class, name = "GroupMemberRemoved"), - JsonSubTypes.Type(Kind.GroupMemberLeft::class, name = "GroupMemberLeft") + JsonSubTypes.Type(Kind.GroupMemberLeft::class, name = "GroupMemberLeft"), + JsonSubTypes.Type(Kind.OpenGroupInvitation::class, name = "OpenGroupInvitation") ) sealed class Kind() { class GroupCreation(): Kind() @@ -34,6 +35,9 @@ class ClosedGroupUpdateMessageData () { constructor(): this(Collections.emptyList()) } class GroupMemberLeft(): Kind() + class OpenGroupInvitation(val groupUrl: String, val groupName: String): Kind() { + constructor(): this("", "") + } } constructor(kind: Kind): this() { @@ -41,22 +45,26 @@ class ClosedGroupUpdateMessageData () { } companion object { - val TAG = ClosedGroupUpdateMessageData::class.simpleName + val TAG = UpdateMessageData::class.simpleName - fun buildGroupUpdate(type: SignalServiceGroup.Type, name: String, members: Collection): ClosedGroupUpdateMessageData? { + fun buildGroupUpdate(type: SignalServiceGroup.Type, name: String, members: Collection): UpdateMessageData? { return when(type) { - SignalServiceGroup.Type.CREATION -> ClosedGroupUpdateMessageData(Kind.GroupCreation()) - SignalServiceGroup.Type.NAME_CHANGE -> ClosedGroupUpdateMessageData(Kind.GroupNameChange(name)) - SignalServiceGroup.Type.MEMBER_ADDED -> ClosedGroupUpdateMessageData(Kind.GroupMemberAdded(members)) - SignalServiceGroup.Type.MEMBER_REMOVED -> ClosedGroupUpdateMessageData(Kind.GroupMemberRemoved(members)) - SignalServiceGroup.Type.QUIT -> ClosedGroupUpdateMessageData(Kind.GroupMemberLeft()) + SignalServiceGroup.Type.CREATION -> UpdateMessageData(Kind.GroupCreation()) + SignalServiceGroup.Type.NAME_CHANGE -> UpdateMessageData(Kind.GroupNameChange(name)) + SignalServiceGroup.Type.MEMBER_ADDED -> UpdateMessageData(Kind.GroupMemberAdded(members)) + SignalServiceGroup.Type.MEMBER_REMOVED -> UpdateMessageData(Kind.GroupMemberRemoved(members)) + SignalServiceGroup.Type.QUIT -> UpdateMessageData(Kind.GroupMemberLeft()) else -> null } } - fun fromJSON(json: String): ClosedGroupUpdateMessageData? { + fun buildOpenGroupInvitation(url: String, name: String): UpdateMessageData { + return UpdateMessageData(Kind.OpenGroupInvitation(url, name)) + } + + fun fromJSON(json: String): UpdateMessageData? { return try { - JsonUtil.fromJson(json, ClosedGroupUpdateMessageData::class.java) + JsonUtil.fromJson(json, UpdateMessageData::class.java) } catch (e: JsonParseException) { Log.e(TAG, "${e.message}") null diff --git a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt index ea610fcd4f..0faa356bd2 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt @@ -1,38 +1,39 @@ package org.session.libsession.utilities -import java.net.MalformedURLException -import java.net.URL +import okhttp3.HttpUrl object OpenGroupUrlParser { // Error sealed class Error(val description: String) : Exception(description) { - class MalformedUrl(message: String?) : Error("Malformed URL: $message.") + class MalformedUrl() : Error("Malformed URL.") 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=" + private const val queryPrefix = "public_key" - fun parseUrl(url: String): OpenGroupRoom { + fun parseUrl(stringUrl: String): OpenGroupRoom { + // Url have to start with 'http://' + val url = if (!stringUrl.startsWith("http")) "http://$stringUrl" else stringUrl // If the URL is malformed, it will throw an exception - val url = try { URL(url) } catch (e: MalformedURLException) { throw Error.MalformedUrl(e.message) } + val httpUrl = HttpUrl.parse(url) ?: throw Error.MalformedUrl() - val host = url.host + val host = httpUrl.host() // Test if the room is specified in the URL - val room = if (!url.path.isNullOrEmpty()) url.path.removePrefix(pathPrefix) else throw Error.NoRoomSpecified + val room = httpUrl.pathSegments().firstOrNull { !it.isNullOrEmpty() } ?: 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 + val publicKey = httpUrl.queryParameter(queryPrefix) ?: throw Error.NoPublicKeySpecified // Public key must be 64 characters if (publicKey.length != 64) throw Error.InvalidPublicKeyProvided return OpenGroupRoom(host,room,publicKey) } + + fun trimParameter(stringUrl: String): String { + return stringUrl.substringBefore("?$queryPrefix") + } } -class OpenGroupRoom(val serverHost: String, val room: String, val serverPublicKey: String) {} +class OpenGroupRoom(val serverHost: String, val room: String, val serverPublicKey: String) { } diff --git a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt index 1d82c849d3..a5d7bcef90 100644 --- a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt +++ b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt @@ -19,6 +19,20 @@ class OpenGroupUrlParserTest { assertEquals(expectedPublicKey, result.serverPublicKey) } + @Test + fun parseUrlNoHttpTest() { + val inputUrl = "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" @@ -33,9 +47,23 @@ class OpenGroupUrlParserTest { assertEquals(expectedPublicKey, result.serverPublicKey) } + @Test + fun parseUrlWithIpAndNoHttpTest() { + val inputUrl = "143.198.213.255/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" + val inputUrl = "file:sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" OpenGroupUrlParser.parseUrl(inputUrl) } @@ -51,12 +79,6 @@ class OpenGroupUrlParserTest { 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" diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto index e5f286cca8..c83d557e85 100644 --- a/libsignal/protobuf/SignalService.proto +++ b/libsignal/protobuf/SignalService.proto @@ -41,7 +41,7 @@ message Content { optional TypingMessage typingMessage = 6; optional ConfigurationMessage configurationMessage = 7; optional DataExtractionNotification dataExtractionNotification = 8; - optional OpenGroupInvitation openGroupInvitation = 9; + } message KeyPair { @@ -103,6 +103,13 @@ message DataMessage { optional string profilePicture = 2; } + message OpenGroupInvitation { + // @required + required string url = 1; + // @required + required string name = 3; + } + message ClosedGroupControlMessage { enum Type { @@ -141,15 +148,11 @@ message DataMessage { optional Quote quote = 8; repeated Preview preview = 10; optional LokiProfile profile = 101; + optional OpenGroupInvitation openGroupInvitation = 102; optional ClosedGroupControlMessage closedGroupControlMessage = 104; optional string syncTarget = 105; } -message OpenGroupInvitation { - optional string groupUrl = 1; - optional string groupName = 2; - } - message ConfigurationMessage { message ClosedGroup { diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java index 8f48a9d8d9..773b46f092 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java @@ -1778,20 +1778,6 @@ public final class SignalServiceProtos { * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); - - // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - boolean hasOpenGroupInvitation(); - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation(); - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); } /** * Protobuf type {@code signalservice.Content} @@ -1909,19 +1895,6 @@ public final class SignalServiceProtos { bitField0_ |= 0x00000010; break; } - case 74: { - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder subBuilder = null; - if (((bitField0_ & 0x00000020) == 0x00000020)) { - subBuilder = openGroupInvitation_.toBuilder(); - } - openGroupInvitation_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(openGroupInvitation_); - openGroupInvitation_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000020; - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -2072,35 +2045,12 @@ public final class SignalServiceProtos { return dataExtractionNotification_; } - // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - public static final int OPENGROUPINVITATION_FIELD_NUMBER = 9; - private org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation openGroupInvitation_; - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public boolean hasOpenGroupInvitation() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation() { - return openGroupInvitation_; - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { - return openGroupInvitation_; - } - private void initFields() { dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2159,9 +2109,6 @@ public final class SignalServiceProtos { if (((bitField0_ & 0x00000010) == 0x00000010)) { output.writeMessage(8, dataExtractionNotification_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeMessage(9, openGroupInvitation_); - } getUnknownFields().writeTo(output); } @@ -2191,10 +2138,6 @@ public final class SignalServiceProtos { size += com.google.protobuf.CodedOutputStream .computeMessageSize(8, dataExtractionNotification_); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(9, openGroupInvitation_); - } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -2308,7 +2251,6 @@ public final class SignalServiceProtos { getTypingMessageFieldBuilder(); getConfigurationMessageFieldBuilder(); getDataExtractionNotificationFieldBuilder(); - getOpenGroupInvitationFieldBuilder(); } } private static Builder create() { @@ -2347,12 +2289,6 @@ public final class SignalServiceProtos { dataExtractionNotificationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000010); - if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); - } else { - openGroupInvitationBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); return this; } @@ -2421,14 +2357,6 @@ public final class SignalServiceProtos { } else { result.dataExtractionNotification_ = dataExtractionNotificationBuilder_.build(); } - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000020; - } - if (openGroupInvitationBuilder_ == null) { - result.openGroupInvitation_ = openGroupInvitation_; - } else { - result.openGroupInvitation_ = openGroupInvitationBuilder_.build(); - } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -2460,9 +2388,6 @@ public final class SignalServiceProtos { if (other.hasDataExtractionNotification()) { mergeDataExtractionNotification(other.getDataExtractionNotification()); } - if (other.hasOpenGroupInvitation()) { - mergeOpenGroupInvitation(other.getOpenGroupInvitation()); - } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -3105,123 +3030,6 @@ public final class SignalServiceProtos { return dataExtractionNotificationBuilder_; } - // optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - private org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public boolean hasOpenGroupInvitation() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getOpenGroupInvitation() { - if (openGroupInvitationBuilder_ == null) { - return openGroupInvitation_; - } else { - return openGroupInvitationBuilder_.getMessage(); - } - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public Builder setOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation value) { - if (openGroupInvitationBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - openGroupInvitation_ = value; - onChanged(); - } else { - openGroupInvitationBuilder_.setMessage(value); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public Builder setOpenGroupInvitation( - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder builderForValue) { - if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = builderForValue.build(); - onChanged(); - } else { - openGroupInvitationBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public Builder mergeOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation value) { - if (openGroupInvitationBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020) && - openGroupInvitation_ != org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance()) { - openGroupInvitation_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); - } else { - openGroupInvitation_ = value; - } - onChanged(); - } else { - openGroupInvitationBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public Builder clearOpenGroupInvitation() { - if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); - onChanged(); - } else { - openGroupInvitationBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); - return this; - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { - bitField0_ |= 0x00000020; - onChanged(); - return getOpenGroupInvitationFieldBuilder().getBuilder(); - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { - if (openGroupInvitationBuilder_ != null) { - return openGroupInvitationBuilder_.getMessageOrBuilder(); - } else { - return openGroupInvitation_; - } - } - /** - * optional .signalservice.OpenGroupInvitation openGroupInvitation = 9; - */ - private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder> - getOpenGroupInvitationFieldBuilder() { - if (openGroupInvitationBuilder_ == null) { - openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder>( - openGroupInvitation_, - getParentForChildren(), - isClean()); - openGroupInvitation_ = null; - } - return openGroupInvitationBuilder_; - } - // @@protoc_insertion_point(builder_scope:signalservice.Content) } @@ -4562,6 +4370,20 @@ public final class SignalServiceProtos { */ org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); + // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + boolean hasOpenGroupInvitation(); + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); + // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; @@ -4722,9 +4544,22 @@ public final class SignalServiceProtos { bitField0_ |= 0x00000080; break; } + case 818: { + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; + if (((bitField0_ & 0x00000100) == 0x00000100)) { + subBuilder = openGroupInvitation_.toBuilder(); + } + openGroupInvitation_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(openGroupInvitation_); + openGroupInvitation_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000100; + break; + } case 834: { org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; - if (((bitField0_ & 0x00000100) == 0x00000100)) { + if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = closedGroupControlMessage_.toBuilder(); } closedGroupControlMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); @@ -4732,11 +4567,11 @@ public final class SignalServiceProtos { subBuilder.mergeFrom(closedGroupControlMessage_); closedGroupControlMessage_ = subBuilder.buildPartial(); } - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; break; } case 842: { - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; syncTarget_ = input.readBytes(); break; } @@ -8535,6 +8370,745 @@ public final class SignalServiceProtos { // @@protoc_insertion_point(class_scope:signalservice.DataMessage.LokiProfile) } + public interface OpenGroupInvitationOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required string url = 1; + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + boolean hasUrl(); + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + java.lang.String getUrl(); + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + com.google.protobuf.ByteString + getUrlBytes(); + + // required string name = 3; + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + boolean hasName(); + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + java.lang.String getName(); + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + com.google.protobuf.ByteString + getNameBytes(); + } + /** + * Protobuf type {@code signalservice.DataMessage.OpenGroupInvitation} + */ + public static final class OpenGroupInvitation extends + com.google.protobuf.GeneratedMessage + implements OpenGroupInvitationOrBuilder { + // Use OpenGroupInvitation.newBuilder() to construct. + private OpenGroupInvitation(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private OpenGroupInvitation(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final OpenGroupInvitation defaultInstance; + public static OpenGroupInvitation getDefaultInstance() { + return defaultInstance; + } + + public OpenGroupInvitation getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private OpenGroupInvitation( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + url_ = input.readBytes(); + break; + } + case 26: { + bitField0_ |= 0x00000002; + name_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public OpenGroupInvitation parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new OpenGroupInvitation(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // required string url = 1; + public static final int URL_FIELD_NUMBER = 1; + private java.lang.Object url_; + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + public boolean hasUrl() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + public java.lang.String getUrl() { + java.lang.Object ref = url_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + url_ = s; + } + return s; + } + } + /** + * required string url = 1; + * + * 
+       * @required
+       *
+ */ + public com.google.protobuf.ByteString + getUrlBytes() { + java.lang.Object ref = url_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + url_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // required string name = 3; + public static final int NAME_FIELD_NUMBER = 3; + private java.lang.Object name_; + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + name_ = s; + } + return s; + } + } + /** + * required string name = 3; + * + * 
+       * @required
+       *
+ */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private void initFields() { + url_ = ""; + name_ = ""; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasUrl()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeBytes(1, getUrlBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(3, getNameBytes()); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getUrlBytes()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(3, getNameBytes()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code signalservice.DataMessage.OpenGroupInvitation} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + } + + // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + url_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + name_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { + return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation build() { + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.url_ = url_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.name_ = name_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) { + return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation other) { + if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; + if (other.hasUrl()) { + bitField0_ |= 0x00000001; + url_ = other.url_; + onChanged(); + } + if (other.hasName()) { + bitField0_ |= 0x00000002; + name_ = other.name_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasUrl()) { + + return false; + } + if (!hasName()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required string url = 1; + private java.lang.Object url_ = ""; + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public boolean hasUrl() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public java.lang.String getUrl() { + java.lang.Object ref = url_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + url_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public com.google.protobuf.ByteString + getUrlBytes() { + java.lang.Object ref = url_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + url_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public Builder setUrl( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + url_ = value; + onChanged(); + return this; + } + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public Builder clearUrl() { + bitField0_ = (bitField0_ & ~0x00000001); + url_ = getDefaultInstance().getUrl(); + onChanged(); + return this; + } + /** + * required string url = 1; + * + * 
+         * @required
+         *
+ */ + public Builder setUrlBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + url_ = value; + onChanged(); + return this; + } + + // required string name = 3; + private java.lang.Object name_ = ""; + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public Builder setName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + name_ = value; + onChanged(); + return this; + } + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000002); + name_ = getDefaultInstance().getName(); + onChanged(); + return this; + } + /** + * required string name = 3; + * + * 
+         * @required
+         *
+ */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + name_ = value; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:signalservice.DataMessage.OpenGroupInvitation) + } + + static { + defaultInstance = new OpenGroupInvitation(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:signalservice.DataMessage.OpenGroupInvitation) + } + public interface ClosedGroupControlMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -11065,6 +11639,28 @@ public final class SignalServiceProtos { return profile_; } + // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + public static final int OPENGROUPINVITATION_FIELD_NUMBER = 102; + private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public boolean hasOpenGroupInvitation() { + return ((bitField0_ & 0x00000100) == 0x00000100); + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + return openGroupInvitation_; + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + return openGroupInvitation_; + } + // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; public static final int CLOSEDGROUPCONTROLMESSAGE_FIELD_NUMBER = 104; private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; @@ -11072,7 +11668,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public boolean hasClosedGroupControlMessage() { - return ((bitField0_ & 0x00000100) == 0x00000100); + return ((bitField0_ & 0x00000200) == 0x00000200); } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; @@ -11094,7 +11690,7 @@ public final class SignalServiceProtos { * optional string syncTarget = 105; */ public boolean hasSyncTarget() { - return ((bitField0_ & 0x00000200) == 0x00000200); + return ((bitField0_ & 0x00000400) == 0x00000400); } /** * optional string syncTarget = 105; @@ -11141,6 +11737,7 @@ public final class SignalServiceProtos { quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); preview_ = java.util.Collections.emptyList(); profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); syncTarget_ = ""; } @@ -11173,6 +11770,12 @@ public final class SignalServiceProtos { return false; } } + if (hasOpenGroupInvitation()) { + if (!getOpenGroupInvitation().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } if (hasClosedGroupControlMessage()) { if (!getClosedGroupControlMessage().isInitialized()) { memoizedIsInitialized = 0; @@ -11217,9 +11820,12 @@ public final class SignalServiceProtos { output.writeMessage(101, profile_); } if (((bitField0_ & 0x00000100) == 0x00000100)) { - output.writeMessage(104, closedGroupControlMessage_); + output.writeMessage(102, openGroupInvitation_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { + output.writeMessage(104, closedGroupControlMessage_); + } + if (((bitField0_ & 0x00000400) == 0x00000400)) { output.writeBytes(105, getSyncTargetBytes()); } getUnknownFields().writeTo(output); @@ -11273,9 +11879,13 @@ public final class SignalServiceProtos { } if (((bitField0_ & 0x00000100) == 0x00000100)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(104, closedGroupControlMessage_); + .computeMessageSize(102, openGroupInvitation_); } if (((bitField0_ & 0x00000200) == 0x00000200)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(104, closedGroupControlMessage_); + } + if (((bitField0_ & 0x00000400) == 0x00000400)) { size += com.google.protobuf.CodedOutputStream .computeBytesSize(105, getSyncTargetBytes()); } @@ -11392,6 +12002,7 @@ public final class SignalServiceProtos { getQuoteFieldBuilder(); getPreviewFieldBuilder(); getProfileFieldBuilder(); + getOpenGroupInvitationFieldBuilder(); getClosedGroupControlMessageFieldBuilder(); } } @@ -11441,14 +12052,20 @@ public final class SignalServiceProtos { profileBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000200); + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + } else { + openGroupInvitationBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000400); if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } else { closedGroupControlMessageBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000400); - syncTarget_ = ""; bitField0_ = (bitField0_ & ~0x00000800); + syncTarget_ = ""; + bitField0_ = (bitField0_ & ~0x00001000); return this; } @@ -11542,13 +12159,21 @@ public final class SignalServiceProtos { if (((from_bitField0_ & 0x00000400) == 0x00000400)) { to_bitField0_ |= 0x00000100; } + if (openGroupInvitationBuilder_ == null) { + result.openGroupInvitation_ = openGroupInvitation_; + } else { + result.openGroupInvitation_ = openGroupInvitationBuilder_.build(); + } + if (((from_bitField0_ & 0x00000800) == 0x00000800)) { + to_bitField0_ |= 0x00000200; + } if (closedGroupControlMessageBuilder_ == null) { result.closedGroupControlMessage_ = closedGroupControlMessage_; } else { result.closedGroupControlMessage_ = closedGroupControlMessageBuilder_.build(); } - if (((from_bitField0_ & 0x00000800) == 0x00000800)) { - to_bitField0_ |= 0x00000200; + if (((from_bitField0_ & 0x00001000) == 0x00001000)) { + to_bitField0_ |= 0x00000400; } result.syncTarget_ = syncTarget_; result.bitField0_ = to_bitField0_; @@ -11645,11 +12270,14 @@ public final class SignalServiceProtos { if (other.hasProfile()) { mergeProfile(other.getProfile()); } + if (other.hasOpenGroupInvitation()) { + mergeOpenGroupInvitation(other.getOpenGroupInvitation()); + } if (other.hasClosedGroupControlMessage()) { mergeClosedGroupControlMessage(other.getClosedGroupControlMessage()); } if (other.hasSyncTarget()) { - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; syncTarget_ = other.syncTarget_; onChanged(); } @@ -11682,6 +12310,12 @@ public final class SignalServiceProtos { return false; } } + if (hasOpenGroupInvitation()) { + if (!getOpenGroupInvitation().isInitialized()) { + + return false; + } + } if (hasClosedGroupControlMessage()) { if (!getClosedGroupControlMessage().isInitialized()) { @@ -12750,6 +13384,123 @@ public final class SignalServiceProtos { return profileBuilder_; } + // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public boolean hasOpenGroupInvitation() { + return ((bitField0_ & 0x00000400) == 0x00000400); + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + if (openGroupInvitationBuilder_ == null) { + return openGroupInvitation_; + } else { + return openGroupInvitationBuilder_.getMessage(); + } + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public Builder setOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + if (openGroupInvitationBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + openGroupInvitation_ = value; + onChanged(); + } else { + openGroupInvitationBuilder_.setMessage(value); + } + bitField0_ |= 0x00000400; + return this; + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public Builder setOpenGroupInvitation( + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = builderForValue.build(); + onChanged(); + } else { + openGroupInvitationBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000400; + return this; + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public Builder mergeOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + if (openGroupInvitationBuilder_ == null) { + if (((bitField0_ & 0x00000400) == 0x00000400) && + openGroupInvitation_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { + openGroupInvitation_ = + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); + } else { + openGroupInvitation_ = value; + } + onChanged(); + } else { + openGroupInvitationBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000400; + return this; + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public Builder clearOpenGroupInvitation() { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + onChanged(); + } else { + openGroupInvitationBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000400); + return this; + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { + bitField0_ |= 0x00000400; + onChanged(); + return getOpenGroupInvitationFieldBuilder().getBuilder(); + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + if (openGroupInvitationBuilder_ != null) { + return openGroupInvitationBuilder_.getMessageOrBuilder(); + } else { + return openGroupInvitation_; + } + } + /** + * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; + */ + private com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> + getOpenGroupInvitationFieldBuilder() { + if (openGroupInvitationBuilder_ == null) { + openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( + openGroupInvitation_, + getParentForChildren(), + isClean()); + openGroupInvitation_ = null; + } + return openGroupInvitationBuilder_; + } + // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< @@ -12758,7 +13509,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public boolean hasClosedGroupControlMessage() { - return ((bitField0_ & 0x00000400) == 0x00000400); + return ((bitField0_ & 0x00000800) == 0x00000800); } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; @@ -12783,7 +13534,7 @@ public final class SignalServiceProtos { } else { closedGroupControlMessageBuilder_.setMessage(value); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return this; } /** @@ -12797,7 +13548,7 @@ public final class SignalServiceProtos { } else { closedGroupControlMessageBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return this; } /** @@ -12805,7 +13556,7 @@ public final class SignalServiceProtos { */ public Builder mergeClosedGroupControlMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { - if (((bitField0_ & 0x00000400) == 0x00000400) && + if (((bitField0_ & 0x00000800) == 0x00000800) && closedGroupControlMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); @@ -12816,7 +13567,7 @@ public final class SignalServiceProtos { } else { closedGroupControlMessageBuilder_.mergeFrom(value); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; return this; } /** @@ -12829,14 +13580,14 @@ public final class SignalServiceProtos { } else { closedGroupControlMessageBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000800); return this; } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return getClosedGroupControlMessageFieldBuilder().getBuilder(); } @@ -12873,7 +13624,7 @@ public final class SignalServiceProtos { * optional string syncTarget = 105; */ public boolean hasSyncTarget() { - return ((bitField0_ & 0x00000800) == 0x00000800); + return ((bitField0_ & 0x00001000) == 0x00001000); } /** * optional string syncTarget = 105; @@ -12913,7 +13664,7 @@ public final class SignalServiceProtos { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; syncTarget_ = value; onChanged(); return this; @@ -12922,7 +13673,7 @@ public final class SignalServiceProtos { * optional string syncTarget = 105; */ public Builder clearSyncTarget() { - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00001000); syncTarget_ = getDefaultInstance().getSyncTarget(); onChanged(); return this; @@ -12935,7 +13686,7 @@ public final class SignalServiceProtos { if (value == null) { throw new NullPointerException(); } - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; syncTarget_ = value; onChanged(); return this; @@ -12952,633 +13703,6 @@ public final class SignalServiceProtos { // @@protoc_insertion_point(class_scope:signalservice.DataMessage) } - public interface OpenGroupInvitationOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional string groupUrl = 1; - /** - * optional string groupUrl = 1; - */ - boolean hasGroupUrl(); - /** - * optional string groupUrl = 1; - */ - java.lang.String getGroupUrl(); - /** - * optional string groupUrl = 1; - */ - com.google.protobuf.ByteString - getGroupUrlBytes(); - - // optional string groupName = 2; - /** - * optional string groupName = 2; - */ - boolean hasGroupName(); - /** - * optional string groupName = 2; - */ - java.lang.String getGroupName(); - /** - * optional string groupName = 2; - */ - com.google.protobuf.ByteString - getGroupNameBytes(); - } - /** - * Protobuf type {@code signalservice.OpenGroupInvitation} - */ - public static final class OpenGroupInvitation extends - com.google.protobuf.GeneratedMessage - implements OpenGroupInvitationOrBuilder { - // Use OpenGroupInvitation.newBuilder() to construct. - private OpenGroupInvitation(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private OpenGroupInvitation(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final OpenGroupInvitation defaultInstance; - public static OpenGroupInvitation getDefaultInstance() { - return defaultInstance; - } - - public OpenGroupInvitation getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private OpenGroupInvitation( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - groupUrl_ = input.readBytes(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - groupName_ = input.readBytes(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public OpenGroupInvitation parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new OpenGroupInvitation(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional string groupUrl = 1; - public static final int GROUPURL_FIELD_NUMBER = 1; - private java.lang.Object groupUrl_; - /** - * optional string groupUrl = 1; - */ - public boolean hasGroupUrl() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string groupUrl = 1; - */ - public java.lang.String getGroupUrl() { - java.lang.Object ref = groupUrl_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - groupUrl_ = s; - } - return s; - } - } - /** - * optional string groupUrl = 1; - */ - public com.google.protobuf.ByteString - getGroupUrlBytes() { - java.lang.Object ref = groupUrl_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - groupUrl_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional string groupName = 2; - public static final int GROUPNAME_FIELD_NUMBER = 2; - private java.lang.Object groupName_; - /** - * optional string groupName = 2; - */ - public boolean hasGroupName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string groupName = 2; - */ - public java.lang.String getGroupName() { - java.lang.Object ref = groupName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - groupName_ = s; - } - return s; - } - } - /** - * optional string groupName = 2; - */ - public com.google.protobuf.ByteString - getGroupNameBytes() { - java.lang.Object ref = groupName_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - groupName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private void initFields() { - groupUrl_ = ""; - groupName_ = ""; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getGroupUrlBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getGroupNameBytes()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getGroupUrlBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getGroupNameBytes()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code signalservice.OpenGroupInvitation} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitationOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.Builder.class); - } - - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - groupUrl_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - groupName_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_OpenGroupInvitation_descriptor; - } - - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation.getDefaultInstance(); - } - - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation result = new org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.groupUrl_ = groupUrl_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.groupName_ = groupName_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation)other); - } else { - super.mergeFrom(other); - return this; - } - } - - 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.hasGroupUrl()) { - bitField0_ |= 0x00000001; - groupUrl_ = other.groupUrl_; - onChanged(); - } - if (other.hasGroupName()) { - bitField0_ |= 0x00000002; - groupName_ = other.groupName_; - onChanged(); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.OpenGroupInvitation) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional string groupUrl = 1; - private java.lang.Object groupUrl_ = ""; - /** - * optional string groupUrl = 1; - */ - public boolean hasGroupUrl() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional string groupUrl = 1; - */ - public java.lang.String getGroupUrl() { - java.lang.Object ref = groupUrl_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - groupUrl_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string groupUrl = 1; - */ - public com.google.protobuf.ByteString - getGroupUrlBytes() { - java.lang.Object ref = groupUrl_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - groupUrl_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string groupUrl = 1; - */ - public Builder setGroupUrl( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - groupUrl_ = value; - onChanged(); - return this; - } - /** - * optional string groupUrl = 1; - */ - public Builder clearGroupUrl() { - bitField0_ = (bitField0_ & ~0x00000001); - groupUrl_ = getDefaultInstance().getGroupUrl(); - onChanged(); - return this; - } - /** - * optional string groupUrl = 1; - */ - public Builder setGroupUrlBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - groupUrl_ = value; - onChanged(); - return this; - } - - // optional string groupName = 2; - private java.lang.Object groupName_ = ""; - /** - * optional string groupName = 2; - */ - public boolean hasGroupName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string groupName = 2; - */ - public java.lang.String getGroupName() { - java.lang.Object ref = groupName_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - groupName_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string groupName = 2; - */ - public com.google.protobuf.ByteString - getGroupNameBytes() { - java.lang.Object ref = groupName_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - groupName_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string groupName = 2; - */ - public Builder setGroupName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - groupName_ = value; - onChanged(); - return this; - } - /** - * optional string groupName = 2; - */ - public Builder clearGroupName() { - bitField0_ = (bitField0_ & ~0x00000002); - groupName_ = getDefaultInstance().getGroupName(); - onChanged(); - return this; - } - /** - * optional string groupName = 2; - */ - public Builder setGroupNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - groupName_ = value; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:signalservice.OpenGroupInvitation) - } - - static { - defaultInstance = new OpenGroupInvitation(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:signalservice.OpenGroupInvitation) - } - public interface ConfigurationMessageOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -21008,6 +21132,11 @@ public final class SignalServiceProtos { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; private static @@ -21018,11 +21147,6 @@ public final class SignalServiceProtos { private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_signalservice_OpenGroupInvitation_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor internal_static_signalservice_ConfigurationMessage_descriptor; private static @@ -21071,7 +21195,7 @@ public final class SignalServiceProtos { "SSAGE\020\007\"{\n\rTypingMessage\022\021\n\ttimestamp\030\001 " + "\002(\004\0223\n\006action\030\002 \002(\0162#.signalservice.Typi" + "ngMessage.Action\"\"\n\006Action\022\013\n\007STARTED\020\000\022" + - "\013\n\007STOPPED\020\001\"\371\002\n\007Content\022/\n\013dataMessage\030", + "\013\n\007STOPPED\020\001\"\270\002\n\007Content\022/\n\013dataMessage\030", "\001 \001(\0132\032.signalservice.DataMessage\0225\n\016rec" + "eiptMessage\030\005 \001(\0132\035.signalservice.Receip" + "tMessage\0223\n\rtypingMessage\030\006 \001(\0132\034.signal" + @@ -21079,79 +21203,79 @@ public final class SignalServiceProtos { "ssage\030\007 \001(\0132#.signalservice.Configuratio" + "nMessage\022M\n\032dataExtractionNotification\030\010" + " \001(\0132).signalservice.DataExtractionNotif" + - "ication\022?\n\023openGroupInvitation\030\t \001(\0132\".s" + - "ignalservice.OpenGroupInvitation\"0\n\007KeyP" + - "air\022\021\n\tpublicKey\030\001 \002(\014\022\022\n\nprivateKey\030\002 \002", - "(\014\"\226\001\n\032DataExtractionNotification\022<\n\004typ" + - "e\030\001 \002(\0162..signalservice.DataExtractionNo" + - "tification.Type\022\021\n\ttimestamp\030\002 \001(\004\"\'\n\004Ty" + - "pe\022\016\n\nSCREENSHOT\020\001\022\017\n\013MEDIA_SAVED\020\002\"\215\013\n\013" + - "DataMessage\022\014\n\004body\030\001 \001(\t\0225\n\013attachments" + - "\030\002 \003(\0132 .signalservice.AttachmentPointer" + - "\022*\n\005group\030\003 \001(\0132\033.signalservice.GroupCon" + - "text\022\r\n\005flags\030\004 \001(\r\022\023\n\013expireTimer\030\005 \001(\r" + - "\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\ttimestamp\030\007 \001(\004\022" + - "/\n\005quote\030\010 \001(\0132 .signalservice.DataMessa", - "ge.Quote\0223\n\007preview\030\n \003(\0132\".signalservic" + - "e.DataMessage.Preview\0227\n\007profile\030e \001(\0132&" + - ".signalservice.DataMessage.LokiProfile\022W" + - "\n\031closedGroupControlMessage\030h \001(\01324.sign" + - "alservice.DataMessage.ClosedGroupControl" + - "Message\022\022\n\nsyncTarget\030i \001(\t\032\225\002\n\005Quote\022\n\n" + - "\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n\004text\030\003 \001(\t\022" + - "F\n\013attachments\030\004 \003(\01321.signalservice.Dat" + - "aMessage.Quote.QuotedAttachment\032\231\001\n\020Quot" + - "edAttachment\022\023\n\013contentType\030\001 \001(\t\022\020\n\010fil", - "eName\030\002 \001(\t\0223\n\tthumbnail\030\003 \001(\0132 .signals" + - "ervice.AttachmentPointer\022\r\n\005flags\030\004 \001(\r\"" + - "\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\032V\n\007Preview\022\013" + - "\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/\n\005image\030\003 \001(" + - "\0132 .signalservice.AttachmentPointer\032:\n\013L" + - "okiProfile\022\023\n\013displayName\030\001 \001(\t\022\026\n\016profi" + - "lePicture\030\002 \001(\t\032\343\003\n\031ClosedGroupControlMe" + - "ssage\022G\n\004type\030\001 \002(\01629.signalservice.Data" + - "Message.ClosedGroupControlMessage.Type\022\021" + - "\n\tpublicKey\030\002 \001(\014\022\014\n\004name\030\003 \001(\t\0221\n\021encry", - "ptionKeyPair\030\004 \001(\0132\026.signalservice.KeyPa" + - "ir\022\017\n\007members\030\005 \003(\014\022\016\n\006admins\030\006 \003(\014\022U\n\010w" + - "rappers\030\007 \003(\0132C.signalservice.DataMessag" + - "e.ClosedGroupControlMessage.KeyPairWrapp" + - "er\032=\n\016KeyPairWrapper\022\021\n\tpublicKey\030\001 \002(\014\022" + - "\030\n\020encryptedKeyPair\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW" + - "\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" + - "ED\020\006\022\017\n\013MEMBER_LEFT\020\007\"$\n\005Flags\022\033\n\027EXPIRA" + - "TION_TIMER_UPDATE\020\002\":\n\023OpenGroupInvitati", - "on\022\020\n\010groupUrl\030\001 \001(\t\022\021\n\tgroupName\030\002 \001(\t\"" + - "\316\003\n\024ConfigurationMessage\022E\n\014closedGroups" + - "\030\001 \003(\0132/.signalservice.ConfigurationMess" + - "age.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n\013d" + - "isplayName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001(\t" + - "\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\0132+" + - ".signalservice.ConfigurationMessage.Cont" + - "act\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022\014" + - "\n\004name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\0132" + - "\026.signalservice.KeyPair\022\017\n\007members\030\004 \003(\014", - "\022\016\n\006admins\030\005 \003(\014\032V\n\007Contact\022\021\n\tpublicKey" + - "\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture\030\003" + - " \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMessa" + - "ge\0220\n\004type\030\001 \002(\0162\".signalservice.Receipt" + - "Message.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Type\022" + - "\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021AttachmentPo" + - "inter\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t\022\013" + - "\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005" + - " \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r" + - "\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n", - " \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Fl" + - "ags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContext\022" + - "\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalservic" + - "e.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007mem" + - "bers\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalservi" + - "ce.AttachmentPointer\022\016\n\006admins\030\006 \003(\t\"H\n\004" + - "Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER" + - "\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org.se" + - "ssion.libsignal.service.internal.pushB\023S" + - "ignalServiceProtos" + "ication\"0\n\007KeyPair\022\021\n\tpublicKey\030\001 \002(\014\022\022\n" + + "\nprivateKey\030\002 \002(\014\"\226\001\n\032DataExtractionNoti" + + "fication\022<\n\004type\030\001 \002(\0162..signalservice.D", + "ataExtractionNotification.Type\022\021\n\ttimest" + + "amp\030\002 \001(\004\"\'\n\004Type\022\016\n\nSCREENSHOT\020\001\022\017\n\013MED" + + "IA_SAVED\020\002\"\214\014\n\013DataMessage\022\014\n\004body\030\001 \001(\t" + + "\0225\n\013attachments\030\002 \003(\0132 .signalservice.At" + + "tachmentPointer\022*\n\005group\030\003 \001(\0132\033.signals" + + "ervice.GroupContext\022\r\n\005flags\030\004 \001(\r\022\023\n\013ex" + + "pireTimer\030\005 \001(\r\022\022\n\nprofileKey\030\006 \001(\014\022\021\n\tt" + + "imestamp\030\007 \001(\004\022/\n\005quote\030\010 \001(\0132 .signalse" + + "rvice.DataMessage.Quote\0223\n\007preview\030\n \003(\013" + + "2\".signalservice.DataMessage.Preview\0227\n\007", + "profile\030e \001(\0132&.signalservice.DataMessag" + + "e.LokiProfile\022K\n\023openGroupInvitation\030f \001" + + "(\0132..signalservice.DataMessage.OpenGroup" + + "Invitation\022W\n\031closedGroupControlMessage\030" + + "h \001(\01324.signalservice.DataMessage.Closed" + + "GroupControlMessage\022\022\n\nsyncTarget\030i \001(\t\032" + + "\225\002\n\005Quote\022\n\n\002id\030\001 \002(\004\022\016\n\006author\030\002 \002(\t\022\014\n" + + "\004text\030\003 \001(\t\022F\n\013attachments\030\004 \003(\01321.signa" + + "lservice.DataMessage.Quote.QuotedAttachm" + + "ent\032\231\001\n\020QuotedAttachment\022\023\n\013contentType\030", + "\001 \001(\t\022\020\n\010fileName\030\002 \001(\t\0223\n\tthumbnail\030\003 \001" + + "(\0132 .signalservice.AttachmentPointer\022\r\n\005" + + "flags\030\004 \001(\r\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\032" + + "V\n\007Preview\022\013\n\003url\030\001 \002(\t\022\r\n\005title\030\002 \001(\t\022/" + + "\n\005image\030\003 \001(\0132 .signalservice.Attachment" + + "Pointer\032:\n\013LokiProfile\022\023\n\013displayName\030\001 " + + "\001(\t\022\026\n\016profilePicture\030\002 \001(\t\0320\n\023OpenGroup" + + "Invitation\022\013\n\003url\030\001 \002(\t\022\014\n\004name\030\003 \002(\t\032\343\003" + + "\n\031ClosedGroupControlMessage\022G\n\004type\030\001 \002(" + + "\01629.signalservice.DataMessage.ClosedGrou", + "pControlMessage.Type\022\021\n\tpublicKey\030\002 \001(\014\022" + + "\014\n\004name\030\003 \001(\t\0221\n\021encryptionKeyPair\030\004 \001(\013" + + "2\026.signalservice.KeyPair\022\017\n\007members\030\005 \003(" + + "\014\022\016\n\006admins\030\006 \003(\014\022U\n\010wrappers\030\007 \003(\0132C.si" + + "gnalservice.DataMessage.ClosedGroupContr" + + "olMessage.KeyPairWrapper\032=\n\016KeyPairWrapp" + + "er\022\021\n\tpublicKey\030\001 \002(\014\022\030\n\020encryptedKeyPai" + + "r\030\002 \002(\014\"r\n\004Type\022\007\n\003NEW\020\001\022\027\n\023ENCRYPTION_K" + + "EY_PAIR\020\003\022\017\n\013NAME_CHANGE\020\004\022\021\n\rMEMBERS_AD" + + "DED\020\005\022\023\n\017MEMBERS_REMOVED\020\006\022\017\n\013MEMBER_LEF", + "T\020\007\"$\n\005Flags\022\033\n\027EXPIRATION_TIMER_UPDATE\020" + + "\002\"\316\003\n\024ConfigurationMessage\022E\n\014closedGrou" + + "ps\030\001 \003(\0132/.signalservice.ConfigurationMe" + + "ssage.ClosedGroup\022\022\n\nopenGroups\030\002 \003(\t\022\023\n" + + "\013displayName\030\003 \001(\t\022\026\n\016profilePicture\030\004 \001" + + "(\t\022\022\n\nprofileKey\030\005 \001(\014\022=\n\010contacts\030\006 \003(\013" + + "2+.signalservice.ConfigurationMessage.Co" + + "ntact\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014" + + "\022\014\n\004name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(" + + "\0132\026.signalservice.KeyPair\022\017\n\007members\030\004 \003", + "(\014\022\016\n\006admins\030\005 \003(\014\032V\n\007Contact\022\021\n\tpublicK" + + "ey\030\001 \002(\014\022\014\n\004name\030\002 \002(\t\022\026\n\016profilePicture" + + "\030\003 \001(\t\022\022\n\nprofileKey\030\004 \001(\014\"u\n\016ReceiptMes" + + "sage\0220\n\004type\030\001 \002(\0162\".signalservice.Recei" + + "ptMessage.Type\022\021\n\ttimestamp\030\002 \003(\004\"\036\n\004Typ" + + "e\022\014\n\010DELIVERY\020\000\022\010\n\004READ\020\001\"\354\001\n\021Attachment" + + "Pointer\022\n\n\002id\030\001 \002(\006\022\023\n\013contentType\030\002 \001(\t" + + "\022\013\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail" + + "\030\005 \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t" + + "\022\r\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height", + "\030\n \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005" + + "Flags\022\021\n\rVOICE_MESSAGE\020\001\"\365\001\n\014GroupContex" + + "t\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signalserv" + + "ice.GroupContext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007m" + + "embers\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .signalser" + + "vice.AttachmentPointer\022\016\n\006admins\030\006 \003(\t\"H" + + "\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIV" + + "ER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004BB\n+org." + + "session.libsignal.service.internal.pushB" + + "\023SignalServiceProtos" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -21175,7 +21299,7 @@ public final class SignalServiceProtos { internal_static_signalservice_Content_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_Content_descriptor, - new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", "OpenGroupInvitation", }); + new java.lang.String[] { "DataMessage", "ReceiptMessage", "TypingMessage", "ConfigurationMessage", "DataExtractionNotification", }); internal_static_signalservice_KeyPair_descriptor = getDescriptor().getMessageTypes().get(3); internal_static_signalservice_KeyPair_fieldAccessorTable = new @@ -21193,7 +21317,7 @@ public final class SignalServiceProtos { internal_static_signalservice_DataMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_descriptor, - new java.lang.String[] { "Body", "Attachments", "Group", "Flags", "ExpireTimer", "ProfileKey", "Timestamp", "Quote", "Preview", "Profile", "ClosedGroupControlMessage", "SyncTarget", }); + new java.lang.String[] { "Body", "Attachments", "Group", "Flags", "ExpireTimer", "ProfileKey", "Timestamp", "Quote", "Preview", "Profile", "OpenGroupInvitation", "ClosedGroupControlMessage", "SyncTarget", }); internal_static_signalservice_DataMessage_Quote_descriptor = internal_static_signalservice_DataMessage_descriptor.getNestedTypes().get(0); internal_static_signalservice_DataMessage_Quote_fieldAccessorTable = new @@ -21218,8 +21342,14 @@ public final class SignalServiceProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_LokiProfile_descriptor, new java.lang.String[] { "DisplayName", "ProfilePicture", }); - internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor = + internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor = internal_static_signalservice_DataMessage_descriptor.getNestedTypes().get(3); + internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor, + new java.lang.String[] { "Url", "Name", }); + internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor = + internal_static_signalservice_DataMessage_descriptor.getNestedTypes().get(4); internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor, @@ -21230,14 +21360,8 @@ public final class SignalServiceProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor, new java.lang.String[] { "PublicKey", "EncryptedKeyPair", }); - internal_static_signalservice_OpenGroupInvitation_descriptor = - getDescriptor().getMessageTypes().get(6); - internal_static_signalservice_OpenGroupInvitation_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_signalservice_OpenGroupInvitation_descriptor, - new java.lang.String[] { "GroupUrl", "GroupName", }); internal_static_signalservice_ConfigurationMessage_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(6); internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_ConfigurationMessage_descriptor, @@ -21255,19 +21379,19 @@ public final class SignalServiceProtos { internal_static_signalservice_ConfigurationMessage_Contact_descriptor, new java.lang.String[] { "PublicKey", "Name", "ProfilePicture", "ProfileKey", }); internal_static_signalservice_ReceiptMessage_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(7); internal_static_signalservice_ReceiptMessage_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_ReceiptMessage_descriptor, new java.lang.String[] { "Type", "Timestamp", }); internal_static_signalservice_AttachmentPointer_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(8); internal_static_signalservice_AttachmentPointer_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_AttachmentPointer_descriptor, new java.lang.String[] { "Id", "ContentType", "Key", "Size", "Thumbnail", "Digest", "FileName", "Flags", "Width", "Height", "Caption", "Url", }); internal_static_signalservice_GroupContext_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(9); internal_static_signalservice_GroupContext_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_signalservice_GroupContext_descriptor, From f51268b587d4a7ff83a71fb8b867380b8a5eb3ac Mon Sep 17 00:00:00 2001 From: Brice-W Date: Wed, 12 May 2021 13:41:00 +1000 Subject: [PATCH 07/29] open group invitation sending part --- .../conversation/ConversationActivity.java | 36 ++++++++++++++++++- .../database/model/ThreadRecord.java | 2 ++ .../menu/conversation_invite_open_group.xml | 8 +++++ app/src/main/res/values-fr/strings.xml | 3 ++ app/src/main/res/values/strings.xml | 2 ++ .../messages/visible/VisibleMessage.kt | 2 +- 6 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 app/src/main/res/menu/conversation_invite_open_group.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 178b29cebe..92845a3ab0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -88,6 +88,7 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate; import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.session.libsession.messaging.messages.signal.OutgoingSecureMediaMessage; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; +import org.session.libsession.messaging.messages.visible.OpenGroupInvitation; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.open_groups.OpenGroup; import org.session.libsession.messaging.open_groups.OpenGroupV2; @@ -157,6 +158,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel; import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity; import org.thoughtcrime.securesms.loki.activities.HomeActivity; +import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity; import org.thoughtcrime.securesms.loki.api.PublicChatInfoUpdateWorker; import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase; import org.thoughtcrime.securesms.loki.database.LokiUserDatabase; @@ -249,11 +251,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity private static final int PICK_GIF = 10; private static final int SMS_DEFAULT = 11; private static final int MEDIA_SENDER = 12; + private static final int INVITE_CONTACTS = 124; private GlideRequests glideRequests; protected ComposeText composeText; private AnimatingToggle buttonToggle; - private ImageButton sendButton; + private ImageButton sendButton; private ImageButton attachButton; private ProfilePictureView profilePictureView; private TextView titleTextView; @@ -593,6 +596,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity }); break; + case INVITE_CONTACTS: + if (data.getExtras() == null || !data.hasExtra(SelectContactsActivity.Companion.getSelectedContactsKey())) return; + String[] selectedContacts = data.getExtras().getStringArray(SelectContactsActivity.Companion.getSelectedContactsKey()); + sendOpenGroupInvitations(selectedContacts); + break; } } @@ -655,6 +663,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity } else if (isActiveGroup()) { inflater.inflate(R.menu.conversation_push_group_options, menu); } + } else if (isOpenGroupOrRSSFeed) { + inflater.inflate(R.menu.conversation_invite_open_group, menu); } inflater.inflate(R.menu.conversation, menu); @@ -763,6 +773,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity // case R.id.menu_conversation_settings: handleConversationSettings(); return true; case R.id.menu_expiring_messages_off: case R.id.menu_expiring_messages: handleSelectMessageExpiration(); return true; + case R.id.menu_invite_to_open_group: handleInviteToOpenGroup(); return true; case android.R.id.home: handleReturnToConversationList(); return true; } @@ -1031,6 +1042,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity startActivity(intent); } + private void handleInviteToOpenGroup() { + Intent intent = new Intent(this, SelectContactsActivity.class); + startActivityForResult(intent, INVITE_CONTACTS); + } + private void handleDistributionBroadcastEnabled(MenuItem item) { distributionType = DistributionTypes.BROADCAST; item.setChecked(true); @@ -1838,6 +1854,24 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity sendComplete(allocatedThreadId); } + private void sendOpenGroupInvitations(String[] contactsID) { + final Context context = getApplicationContext(); + OpenGroupV2 openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadId); + for (String contactId: contactsID) { + Recipient recipient = Recipient.from(context, Address.fromSerialized(contactId), true); + VisibleMessage message = new VisibleMessage(); + message.setSentTimestamp(System.currentTimeMillis()); + OpenGroupInvitation openGroupInvitationMessage = new OpenGroupInvitation(); + openGroupInvitationMessage.setGroupName(openGroup.getName()); + openGroupInvitationMessage.setGroupUrl(openGroup.toJoinUrl()); + message.setOpenGroupInvitation(openGroupInvitationMessage); + OutgoingTextMessage outgoingTextMessage = OutgoingTextMessage.fromOpenGroupInvitation(openGroupInvitationMessage, recipient, message.getSentTimestamp()); + + DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(-1, outgoingTextMessage, message.getSentTimestamp()); + MessageSender.send(message, recipient.getAddress()); + } + } + private void updateToggleButtonState() { if (inputPanel.isRecordingInLockedMode()) { buttonToggle.display(sendButton); diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java index b0183cff63..1833ac4270 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -77,6 +77,8 @@ public class ThreadRecord extends DisplayRecord { return emphasisAdded(context.getString(R.string.ThreadRecord_group_updated)); } else if (isGroupQuit()) { return emphasisAdded(context.getString(R.string.ThreadRecord_left_the_group)); + } else if (isOpenGroupInvitation()) { + return emphasisAdded(context.getString(R.string.ThreadRecord_open_group_invitation)); } else if (isKeyExchange()) { return emphasisAdded(context.getString(R.string.ConversationListItem_key_exchange_message)); } else if (SmsDatabase.Types.isFailedDecryptType(type)) { diff --git a/app/src/main/res/menu/conversation_invite_open_group.xml b/app/src/main/res/menu/conversation_invite_open_group.xml new file mode 100644 index 0000000000..0cef563b7c --- /dev/null +++ b/app/src/main/res/menu/conversation_invite_open_group.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b4c1cdcd1e..403685a6c5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -151,6 +151,7 @@ La pièce jointe dépasse la limite de taille autorisée. L’appareil photo n’est pas disponible Impossible d’enregistrer l’audio ! + Ajouter des membres Il n’y a aucune appli pour gérer ce lien sur votre appareil. Pour envoyer des messages audio, autorisez Session à accéder à votre microphone. Session exige l’autorisation Microphone afin d’envoyer des messages audio, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Microphone ». @@ -599,6 +600,8 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i Votre numéro de sécurité avec %s a changé Vous avez marqué comme vérifié Vous avez marqué comme non vérifié + Cette conversation est vide + Invitation à un groupe public Mise à jour de Session Une nouvelle version de Session est proposée. Touchez pour lancer la mise à jour diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b5a6f20f1..a6efce07db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -175,6 +175,7 @@ Camera unavailable Unable to record audio! There is no app available to handle this link on your device. + Add members Session needs microphone access to send audio messages. Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\". @@ -722,6 +723,7 @@ You marked verified You marked unverified This conversation is empty + Open group invitation Session update diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 5452ba7b51..11a398df42 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -70,9 +70,9 @@ class VisibleMessage : Message() { override fun isValid(): Boolean { if (!super.isValid()) return false if (attachmentIDs.isNotEmpty()) return true + if (openGroupInvitation != null) return true val text = text?.trim() ?: return false if (text.isNotEmpty()) return true - if (openGroupInvitation != null) return true return false } From 2f0509a03bc5b0af8cdd984382b84192695e4a5e Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 13 May 2021 14:29:29 +1000 Subject: [PATCH 08/29] join open group from received invitation --- .../conversation/ConversationItem.java | 2 +- .../loki/views/OpenGroupInvitationView.kt | 48 +++++++++++++++---- app/src/main/res/values-fr/strings.xml | 3 ++ app/src/main/res/values/strings.xml | 2 + .../utilities/OpenGroupUrlParser.kt | 7 +-- .../utilities/OpenGroupUrlParserTest.kt | 16 +++---- 6 files changed, 57 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 472a4e5bd2..419113ea49 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -643,7 +643,7 @@ public class ConversationItem extends LinearLayout if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) { UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind(); name = data.getGroupName(); - url = OpenGroupUrlParser.INSTANCE.trimParameter(data.getGroupUrl()); + url = data.getGroupUrl(); } openGroupInvitationViewStub.get().setOpenGroup(name, url, messageRecord.isOutgoing()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index fe3b9c0155..359372b71a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -1,17 +1,20 @@ package org.thoughtcrime.securesms.loki.views import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.View import android.widget.FrameLayout import android.widget.ImageView -import android.widget.LinearLayout import android.widget.TextView -import androidx.core.content.ContextCompat +import android.widget.Toast +import androidx.appcompat.app.AlertDialog import network.loki.messenger.R +import org.session.libsession.utilities.GroupUtil +import org.session.libsession.utilities.OpenGroupUrlParser import org.session.libsignal.utilities.logging.Log -import java.io.IOException +import org.thoughtcrime.securesms.groups.GroupManager +import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol +import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities class OpenGroupInvitationView : FrameLayout { @@ -22,7 +25,9 @@ class OpenGroupInvitationView : FrameLayout { private val joinButton: ImageView private val openGroupIcon: ImageView private val groupName: TextView - private val groupUrl: TextView + private val displayedUrl: TextView + + private var groupUrl: String = "" constructor(context: Context): this(context, null) @@ -33,14 +38,15 @@ class OpenGroupInvitationView : FrameLayout { joinButton = findViewById(R.id.join_open_group) openGroupIcon = findViewById(R.id.open_group_icon) groupName = findViewById(R.id.group_name) - groupUrl = findViewById(R.id.group_url) + displayedUrl = findViewById(R.id.group_url) - joinButton.setOnClickListener { } + joinButton.setOnClickListener { joinPublicGroup(groupUrl) } } fun setOpenGroup(name: String, url: String, isOutgoing: Boolean = false) { groupName.text = name - groupUrl.text = url + displayedUrl.text = OpenGroupUrlParser.trimParameter(url) + groupUrl = url if(isOutgoing) { joinButton.visibility = View.GONE @@ -51,8 +57,32 @@ class OpenGroupInvitationView : FrameLayout { } } - fun joinPublicGroup(url: String) { + private fun joinPublicGroup(url: String) { + val openGroup = OpenGroupUrlParser.parseUrl(url) + val builder = AlertDialog.Builder(context) + builder.setTitle(context.getString(R.string.ConversationActivity_join_open_group, groupName.text.toString())) + builder.setIconAttribute(R.attr.dialog_info_icon) + builder.setCancelable(true) + var message: String = + context.getString(R.string.ConversationActivity_join_open_group_confirmation_message, groupName.text.toString()) + + builder.setMessage(message) + builder.setPositiveButton(R.string.yes) { dialog, which -> + try { + val group = OpenGroupUtilities.addGroup(context, openGroup.server, openGroup.room, openGroup.serverPublicKey) + val threadID = GroupManager.getOpenGroupThreadID(group.id, context) + val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray()) + + MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context) + } catch (e: Exception) { + Log.e("JoinPublicChatActivity", "Failed to join open group.", e) + Toast.makeText(context, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show() + } + } + + builder.setNegativeButton(R.string.no, null) + builder.show() } } \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 403685a6c5..f57faa12c5 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -152,6 +152,9 @@ L’appareil photo n’est pas disponible Impossible d’enregistrer l’audio ! Ajouter des membres + Rejoindre %s + Êtes-vous sûr de vouloir rejoindre le group public %s? + Il n’y a aucune appli pour gérer ce lien sur votre appareil. Pour envoyer des messages audio, autorisez Session à accéder à votre microphone. Session exige l’autorisation Microphone afin d’envoyer des messages audio, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner « Autorisations » et activer « Microphone ». diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a6efce07db..383867b4ae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -176,6 +176,8 @@ Unable to record audio! There is no app available to handle this link on your device. Add members + Join %s + Are you sure you want to join the %s open group? Session needs microphone access to send audio messages. Session needs microphone access to send audio messages, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Microphone\". diff --git a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt index 0faa356bd2..d589032025 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt @@ -12,6 +12,7 @@ object OpenGroupUrlParser { object InvalidPublicKeyProvided : Error("Invalid public key provided.") } + private const val suffix = "/" private const val queryPrefix = "public_key" fun parseUrl(stringUrl: String): OpenGroupRoom { @@ -20,7 +21,7 @@ object OpenGroupUrlParser { // If the URL is malformed, it will throw an exception val httpUrl = HttpUrl.parse(url) ?: throw Error.MalformedUrl() - val host = httpUrl.host() + val server = HttpUrl.Builder().scheme(httpUrl.scheme()).host(httpUrl.host()).port(httpUrl.port()).build().toString().removeSuffix(suffix) // Test if the room is specified in the URL val room = httpUrl.pathSegments().firstOrNull { !it.isNullOrEmpty() } ?: throw Error.NoRoomSpecified // Test if the query is specified in the URL @@ -28,7 +29,7 @@ object OpenGroupUrlParser { // Public key must be 64 characters if (publicKey.length != 64) throw Error.InvalidPublicKeyProvided - return OpenGroupRoom(host,room,publicKey) + return OpenGroupRoom(server,room,publicKey) } fun trimParameter(stringUrl: String): String { @@ -36,4 +37,4 @@ object OpenGroupUrlParser { } } -class OpenGroupRoom(val serverHost: String, val room: String, val serverPublicKey: String) { } +class OpenGroupRoom(val server: String, val room: String, val serverPublicKey: String) {} diff --git a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt index a5d7bcef90..b212fbce8a 100644 --- a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt +++ b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt @@ -9,12 +9,12 @@ class OpenGroupUrlParserTest { fun parseUrlTest() { val inputUrl = "https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" - val expectedHost = "sessionopengroup.co" + val expectedHost = "https://sessionopengroup.co" val expectedRoom = "main" val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" val result = OpenGroupUrlParser.parseUrl(inputUrl) - assertEquals(expectedHost, result.serverHost) + assertEquals(expectedHost, result.server) assertEquals(expectedRoom, result.room) assertEquals(expectedPublicKey, result.serverPublicKey) } @@ -23,12 +23,12 @@ class OpenGroupUrlParserTest { fun parseUrlNoHttpTest() { val inputUrl = "sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" - val expectedHost = "sessionopengroup.co" + val expectedHost = "http://sessionopengroup.co" val expectedRoom = "main" val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" val result = OpenGroupUrlParser.parseUrl(inputUrl) - assertEquals(expectedHost, result.serverHost) + assertEquals(expectedHost, result.server) assertEquals(expectedRoom, result.room) assertEquals(expectedPublicKey, result.serverPublicKey) } @@ -37,12 +37,12 @@ class OpenGroupUrlParserTest { fun parseUrlWithIpTest() { val inputUrl = "https://143.198.213.255:80/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" - val expectedHost = "143.198.213.255" + val expectedHost = "https://143.198.213.255:80" val expectedRoom = "main" val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" val result = OpenGroupUrlParser.parseUrl(inputUrl) - assertEquals(expectedHost, result.serverHost) + assertEquals(expectedHost, result.server) assertEquals(expectedRoom, result.room) assertEquals(expectedPublicKey, result.serverPublicKey) } @@ -51,12 +51,12 @@ class OpenGroupUrlParserTest { fun parseUrlWithIpAndNoHttpTest() { val inputUrl = "143.198.213.255/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" - val expectedHost = "143.198.213.255" + val expectedHost = "http://143.198.213.255" val expectedRoom = "main" val expectedPublicKey = "658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" val result = OpenGroupUrlParser.parseUrl(inputUrl) - assertEquals(expectedHost, result.serverHost) + assertEquals(expectedHost, result.server) assertEquals(expectedRoom, result.room) assertEquals(expectedPublicKey, result.serverPublicKey) } From e1b8f10eececeb01318d1af222dd6f340d6d01ba Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 13 May 2021 14:57:14 +1000 Subject: [PATCH 09/29] resend invitation if send has failed --- .../securesms/MessageDetailsActivity.java | 16 ++++++++++++++-- .../securesms/conversation/ConversationItem.java | 1 - 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index 79ee15c8a7..cb673cf978 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -38,11 +38,12 @@ import androidx.loader.content.Loader; import org.session.libsession.messaging.messages.visible.LinkPreview; +import org.session.libsession.messaging.messages.visible.OpenGroupInvitation; import org.session.libsession.messaging.messages.visible.Quote; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.open_groups.OpenGroup; import org.session.libsession.messaging.sending_receiving.MessageSender; -import org.session.libsession.messaging.sending_receiving.attachments.Attachment; +import org.session.libsession.messaging.utilities.UpdateMessageData; import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus; import org.session.libsession.utilities.color.MaterialColor; import org.thoughtcrime.securesms.conversation.ConversationItem; @@ -448,7 +449,18 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity Recipient recipient = messageRecord.getRecipient(); VisibleMessage message = new VisibleMessage(); message.setId(messageRecord.getId()); - message.setText(messageRecord.getBody()); + if (messageRecord.isOpenGroupInvitation()) { + OpenGroupInvitation openGroupInvitation = new OpenGroupInvitation(); + UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(messageRecord.getBody()); + if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) { + UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind(); + openGroupInvitation.setGroupName(data.getGroupName()); + openGroupInvitation.setGroupUrl(data.getGroupUrl()); + } + message.setOpenGroupInvitation(openGroupInvitation); + } else { + message.setText(messageRecord.getBody()); + } message.setSentTimestamp(messageRecord.getTimestamp()); if (recipient.isGroupRecipient()) { message.setGroupPublicKey(recipient.getAddress().toGroupString()); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 419113ea49..1b7d11e743 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -65,7 +65,6 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; -import org.session.libsession.utilities.OpenGroupUrlParser; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.Util; From b562aa5738d2506fd9510f8f120c4b3928c705a0 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Thu, 13 May 2021 15:59:24 +1000 Subject: [PATCH 10/29] set notification text --- .../securesms/notifications/DefaultMessageNotifier.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 376262cf7c..cf96ace8ce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -481,6 +481,8 @@ public class DefaultMessageNotifier implements MessageNotifier { String message = slideDeck.getBody() + ": " + record.getBody(); int italicLength = message.length() - body.length(); body = SpanUtil.italic(message, italicLength); + } else if (record.isOpenGroupInvitation()) { + body = SpanUtil.italic(context.getString(R.string.ThreadRecord_open_group_invitation)); } if (threadRecipients == null || !threadRecipients.isMuted()) { From 8dd606cbb32cfdf0f8be00a8282a84cd385284a3 Mon Sep 17 00:00:00 2001 From: Brice-W Date: Fri, 14 May 2021 10:26:38 +1000 Subject: [PATCH 11/29] join open group code executed in a coroutine so it's not blocking the UI --- .../loki/views/OpenGroupInvitationView.kt | 31 ++++++++++++++----- .../res/layout/open_group_invitation_view.xml | 6 ++-- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index 359372b71a..b0d0c440c5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -8,6 +8,9 @@ import android.widget.ImageView import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AlertDialog +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.OpenGroupUrlParser @@ -69,15 +72,27 @@ class OpenGroupInvitationView : FrameLayout { builder.setMessage(message) builder.setPositiveButton(R.string.yes) { dialog, which -> - try { - val group = OpenGroupUtilities.addGroup(context, openGroup.server, openGroup.room, openGroup.serverPublicKey) - val threadID = GroupManager.getOpenGroupThreadID(group.id, context) - val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray()) + GlobalScope.launch(Dispatchers.IO) { + try { + dialog.dismiss() + val group = OpenGroupUtilities.addGroup( + context, + openGroup.server, + openGroup.room, + openGroup.serverPublicKey + ) + val threadID = GroupManager.getOpenGroupThreadID(group.id, context) + val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray()) - MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context) - } catch (e: Exception) { - Log.e("JoinPublicChatActivity", "Failed to join open group.", e) - Toast.makeText(context, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show() + MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context) + } catch (e: Exception) { + Log.e("JoinPublicChatActivity", "Failed to join open group.", e) + Toast.makeText( + context, + R.string.activity_join_public_chat_error, + Toast.LENGTH_SHORT + ).show() + } } } diff --git a/app/src/main/res/layout/open_group_invitation_view.xml b/app/src/main/res/layout/open_group_invitation_view.xml index b70dd8dd2c..4074ca3174 100644 --- a/app/src/main/res/layout/open_group_invitation_view.xml +++ b/app/src/main/res/layout/open_group_invitation_view.xml @@ -28,11 +28,11 @@ From d61b1c05f08b6f4825c46ce8d7dfc292624f34db Mon Sep 17 00:00:00 2001 From: beantaco <64012487+beantaco@users.noreply.github.com> Date: Fri, 14 May 2021 03:17:40 +0000 Subject: [PATCH 12/29] Fix some Japanese translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - In message details, "Disappears" (meant as message lifetime) is translated to "寿命" (lifetime). - Translation of "decentralized" is changed from "分散型" (distributed) to "非中央集中型". - "Session ID を入力してください" (translation of "Enter Session ID" tab) is too long and was not expressed in command form. -> "Session ID を入力する" - "パス" (the translation of "path") could be a translation of "pass" and its meaning is ambiguous, so is changed to "経路" (route). - "お知らせ" (also a translation of "news" and "announcement") is changed to "通知" (notification), making translation of "notification" more consistent. --- app/src/main/res/values-ja/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a7def0f52f..3226a4bb0c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -903,7 +903,7 @@ 問題があります 送信 受信 - 消える + 寿命 経由 To: From: @@ -1004,7 +1004,7 @@ MMSC URL MMSプロキシ・ホスト MMSプロキシ・ポート - MMSCユーザ名 + MMSCユーザー名 MMSCパスワード SMS配信報告 送信する全てのSMSに配信報告をつけます @@ -1060,7 +1060,7 @@ アイコンを表示する 送信者の秘匿化を用いて届けられたメッセージで「メッセージの詳細」を選択した際に、ステータスアイコンを表示します。 全員を許可する - あなたのプロファイルを共有しておらず、連絡先にもないユーザからのメッセージ受信において、送信者の秘匿化を有効にします。 + あなたのプロファイルを共有しておらず、連絡先にもないユーザーからのメッセージ受信において、送信者の秘匿化を有効にします。 さらに詳しく @@ -1149,7 +1149,7 @@ Sessionに招待する %1$sさんとの通信を、進化させよう！ 友達にオススメしよう！ - ユーザが増やせば増やすほど、Sessionはより便利になります + ユーザーが増えれば増えるほど、Sessionはより便利になります Sessionは技術的な問題を抱えています。私たちは、これをできるだけ早く解決するよう対応しています。 Sessionの最新機能は、このバージョンのAndroidでは対応しなくなります。OSの更新をしてください。 @@ -1271,7 +1271,7 @@ 端末をリンクできませんでした。 次 共有する - Session ID が不正です + Session ID が正しくありません 取り消す あなたの Session ID @@ -1282,7 +1282,7 @@ 端末は正常にリンク解除されました Session とは？ - 分散型の暗号化されたメッセージングアプリです + 非中央集中型の暗号化されたメッセージングアプリです 個人情報や会話のメタデータは収集されませんか？どのように機能しますか？ 高度な匿名ルーティングとエンドツーエンドの暗号化テクノロジーを組み合わせて使用します。 友人は、セキュリティ侵害されたメッセンジャーを自らの友人に使用させません。どういたしまして。 @@ -1296,7 +1296,7 @@ リカバリーフレーズを入力してください 端末をリンクする - Session ID を入力してください + Session ID を入力する QR コードをスキャンする 他の端末で「設定」>「端末」>「端末をリンクする」に移動し、表示される QR コードをスキャンして、リンクプロセスを開始します。 @@ -1330,8 +1330,8 @@ 編集された単語をタップして長押ししてリカバリーフレーズを表示し、それを安全に保管して Session ID を保護します。 リカバリーフレーズは安全な場所に保管してください - パス - Session は、Sessionの分散型ネットワークの複数のサービスノードを介してメッセージをバウンスすることにより、IP を隠します。これらは、接続が現在バウンスされている国です。 + 経路 + Session は、Sessionの非中央集中型ネットワーク内の複数のサービスノードを介してメッセージを経由させることにより、IP を隠します。以下は接続が現在経由している国です： あなた エントリーノード サービスノード @@ -1358,7 +1358,7 @@ 短いグループ名を入力してください グループメンバーを少なくとも 2 人選択してください 非公開グループは 100 人を超えるメンバーを抱えることはできません - グループのメンバーの 1 人の Session ID が不正です + グループのメンバーの 1 人の Session ID が正しくありません 公開グループに参加する グループに参加できませんでした @@ -1374,13 +1374,13 @@ a-z、A-Z、0-9、_ の文字のみで構成される表示名を選択してください 短い表示名を選択してください プライバシー - お知らせ + 通知 チャット 端末 リカバリーフレーズ データを消去する - お知らせ + 通知 通知スタイル 通知内容 From 4b225c1456657b26b0bc4d843cc4a6d98a571282 Mon Sep 17 00:00:00 2001 From: beantaco <64012487+beantaco@users.noreply.github.com> Date: Fri, 14 May 2021 03:26:20 +0000 Subject: [PATCH 13/29] Add new Japanese translations --- app/src/main/res/values-ja/strings.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 3226a4bb0c..991ecdee1e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1438,5 +1438,24 @@ 連絡先 非公開グループ 公開グループ + 公開鍵をコピーする + Session ID をコピーする + メンバーを追加 + ユーザーを削除します。よろしいですか？ + メンバー一覧 + グループ名を空白に変更できません + 短いグループ名を入力してください + グループのメンバーの 1 人の Session ID が正しくありません + ユーザーがグループから削除されました + グループには1人以上のメンバーがいなければなりません + グループを編集 + 招待 + 連絡先を選択 + 詳細 + ライト + ダーク + システムデフォルト + テーマ + ユーザーをグループから削除する From b248b5c52bbcd77ceee7600b1a59a3ee6119e88e Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 13:37:12 +1000 Subject: [PATCH 14/29] Fix build --- .../securesms/conversation/ConversationActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 59fc091455..6c8f5047b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -1868,7 +1868,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity message.setSentTimestamp(System.currentTimeMillis()); OpenGroupInvitation openGroupInvitationMessage = new OpenGroupInvitation(); openGroupInvitationMessage.setGroupName(openGroup.getName()); - openGroupInvitationMessage.setGroupUrl(openGroup.toJoinUrl()); + openGroupInvitationMessage.setGroupUrl(openGroup.getJoinURL()); message.setOpenGroupInvitation(openGroupInvitationMessage); OutgoingTextMessage outgoingTextMessage = OutgoingTextMessage.fromOpenGroupInvitation(openGroupInvitationMessage, recipient, message.getSentTimestamp()); From 33e77dde1e762cb940db66377e80e90a9c9ae45b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 13:46:17 +1000 Subject: [PATCH 15/29] Fix group deletion --- .../thoughtcrime/securesms/loki/api/PublicChatManager.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt index c270797c6c..70bb78d8b6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatManager.kt @@ -150,9 +150,10 @@ class PublicChatManager(private val context: Context) { val groupId = "$server.$room" val threadId = GroupManager.getOpenGroupThreadID(groupId, context) val groupAddress = threadDB.getRecipientForThreadId(threadId)!!.address.serialize() - GroupManager.deleteGroup(groupAddress, context) - - Util.runOnMain { startPollersIfNeeded() } + ThreadUtils.queue { + GroupManager.deleteGroup(groupAddress, context) // Must be invoked on a background thread + Util.runOnMain { startPollersIfNeeded() } + } } private fun refreshChatsAndPollers() { From 5fd99cd8f12797dc84c4bbd754eccfead5fc9ec5 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 13:50:53 +1000 Subject: [PATCH 16/29] Fix indentation --- libsignal/protobuf/SignalService.proto | 1 - 1 file changed, 1 deletion(-) diff --git a/libsignal/protobuf/SignalService.proto b/libsignal/protobuf/SignalService.proto index c83d557e85..624446adcd 100644 --- a/libsignal/protobuf/SignalService.proto +++ b/libsignal/protobuf/SignalService.proto @@ -41,7 +41,6 @@ message Content { optional TypingMessage typingMessage = 6; optional ConfigurationMessage configurationMessage = 7; optional DataExtractionNotification dataExtractionNotification = 8; - } message KeyPair { From cf3f0fbe57070756d5a4f0b514c12414400fbd91 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 13:57:18 +1000 Subject: [PATCH 17/29] Minor refactoring --- .../loki/views/OpenGroupInvitationView.kt | 2 +- .../utilities/OpenGroupUrlParser.kt | 42 +++++++++---------- .../utilities/OpenGroupUrlParserTest.kt | 8 ++-- 3 files changed, 24 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index b0d0c440c5..98d13e8f5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -48,7 +48,7 @@ class OpenGroupInvitationView : FrameLayout { fun setOpenGroup(name: String, url: String, isOutgoing: Boolean = false) { groupName.text = name - displayedUrl.text = OpenGroupUrlParser.trimParameter(url) + displayedUrl.text = OpenGroupUrlParser.trimQueryParameter(url) groupUrl = url if(isOutgoing) { diff --git a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt index d589032025..22e9abae2e 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt @@ -4,37 +4,33 @@ import okhttp3.HttpUrl object OpenGroupUrlParser { - // Error sealed class Error(val description: String) : Exception(description) { - class MalformedUrl() : Error("Malformed URL.") - object NoRoomSpecified : Error("No room specified in the URL.") - object NoPublicKeySpecified : Error("No public key specified in the URL.") - object InvalidPublicKeyProvided : Error("Invalid public key provided.") + object MalformedURL : Error("Malformed URL.") + object NoRoom : Error("No room specified in the URL.") + object NoPublicKey : Error("No public key specified in the URL.") + object InvalidPublicKey : Error("Invalid public key provided.") } private const val suffix = "/" private const val queryPrefix = "public_key" - fun parseUrl(stringUrl: String): OpenGroupRoom { - // Url have to start with 'http://' - val url = if (!stringUrl.startsWith("http")) "http://$stringUrl" else stringUrl - // If the URL is malformed, it will throw an exception - val httpUrl = HttpUrl.parse(url) ?: throw Error.MalformedUrl() - - val server = HttpUrl.Builder().scheme(httpUrl.scheme()).host(httpUrl.host()).port(httpUrl.port()).build().toString().removeSuffix(suffix) - // Test if the room is specified in the URL - val room = httpUrl.pathSegments().firstOrNull { !it.isNullOrEmpty() } ?: throw Error.NoRoomSpecified - // Test if the query is specified in the URL - val publicKey = httpUrl.queryParameter(queryPrefix) ?: throw Error.NoPublicKeySpecified - // Public key must be 64 characters - if (publicKey.length != 64) throw Error.InvalidPublicKeyProvided - - return OpenGroupRoom(server,room,publicKey) + fun parseUrl(string: String): V2OpenGroupInfo { + // URL has to start with 'http://' + val urlWithPrefix = if (!string.startsWith("http")) "http://$string" else string + // If the URL is malformed, throw an exception + val url = HttpUrl.parse(urlWithPrefix) ?: throw Error.MalformedURL + // Parse components + val server = HttpUrl.Builder().scheme(url.scheme()).host(url.host()).port(url.port()).build().toString().removeSuffix(suffix) + val room = url.pathSegments().firstOrNull { !it.isNullOrEmpty() } ?: throw Error.NoRoom + val publicKey = url.queryParameter(queryPrefix) ?: throw Error.NoPublicKey + if (publicKey.length != 64) throw Error.InvalidPublicKey + // Return + return V2OpenGroupInfo(server,room,publicKey) } - fun trimParameter(stringUrl: String): String { - return stringUrl.substringBefore("?$queryPrefix") + fun trimQueryParameter(string: String): String { + return string.substringBefore("?$queryPrefix") } } -class OpenGroupRoom(val server: String, val room: String, val serverPublicKey: String) {} +class V2OpenGroupInfo(val server: String, val room: String, val serverPublicKey: String) {} diff --git a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt index b212fbce8a..38a244699d 100644 --- a/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt +++ b/libsession/src/test/java/org/session/libsession/utilities/OpenGroupUrlParserTest.kt @@ -61,25 +61,25 @@ class OpenGroupUrlParserTest { assertEquals(expectedPublicKey, result.serverPublicKey) } - @Test(expected = OpenGroupUrlParser.Error.MalformedUrl::class) + @Test(expected = OpenGroupUrlParser.Error.MalformedURL::class) fun parseUrlMalformedUrlTest() { val inputUrl = "file:sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" OpenGroupUrlParser.parseUrl(inputUrl) } - @Test(expected = OpenGroupUrlParser.Error.NoRoomSpecified::class) + @Test(expected = OpenGroupUrlParser.Error.NoRoom::class) fun parseUrlNoRoomSpecifiedTest() { val inputUrl = "https://sessionopengroup.comain?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adffb231c" OpenGroupUrlParser.parseUrl(inputUrl) } - @Test(expected = OpenGroupUrlParser.Error.NoPublicKeySpecified::class) + @Test(expected = OpenGroupUrlParser.Error.NoPublicKey::class) fun parseUrlNoPublicKeySpecifiedTest() { val inputUrl = "https://sessionopengroup.co/main" OpenGroupUrlParser.parseUrl(inputUrl) } - @Test(expected = OpenGroupUrlParser.Error.InvalidPublicKeyProvided::class) + @Test(expected = OpenGroupUrlParser.Error.InvalidPublicKey::class) fun parseUrlInvalidPublicKeyProviedTest() { val inputUrl = "https://sessionopengroup.co/main?public_key=658d29b91892a2389505596b135e76a53db6e11d613a51dbd3d0816adff" OpenGroupUrlParser.parseUrl(inputUrl) From 6b3aa8632428a9ae338bd95c19dfaf40807da207 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 15:18:41 +1000 Subject: [PATCH 18/29] Minor refactoring --- .../securesms/MessageDetailsActivity.java | 4 +- .../conversation/ConversationActivity.java | 11 ++- .../securesms/database/MmsSmsColumns.java | 6 +- .../securesms/database/Storage.kt | 2 +- .../database/model/DisplayRecord.java | 2 - .../loki/views/OpenGroupInvitationView.kt | 76 +++++++------------ .../res/layout/open_group_invitation_view.xml | 61 +++++++-------- .../messages/signal/IncomingTextMessage.java | 7 +- .../messages/signal/OutgoingTextMessage.java | 10 ++- .../messages/visible/OpenGroupInvitation.kt | 29 +++---- .../messages/visible/VisibleMessage.kt | 18 ++--- .../ReceivedMessageHandler.kt | 16 +--- .../utilities/OpenGroupUrlParser.kt | 2 +- 13 files changed, 106 insertions(+), 138 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index cb673cf978..5789d6f791 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -454,8 +454,8 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(messageRecord.getBody()); if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) { UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind(); - openGroupInvitation.setGroupName(data.getGroupName()); - openGroupInvitation.setGroupUrl(data.getGroupUrl()); + openGroupInvitation.setName(data.getGroupName()); + openGroupInvitation.setUrl(data.getGroupUrl()); } message.setOpenGroupInvitation(openGroupInvitation); } else { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 6c8f5047b2..8143b5df5f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -1859,19 +1859,18 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity sendComplete(allocatedThreadId); } - private void sendOpenGroupInvitations(String[] contactsID) { + private void sendOpenGroupInvitations(String[] contactIDs) { final Context context = getApplicationContext(); OpenGroupV2 openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadId); - for (String contactId: contactsID) { - Recipient recipient = Recipient.from(context, Address.fromSerialized(contactId), true); + for (String contactID : contactIDs) { + Recipient recipient = Recipient.from(context, Address.fromSerialized(contactID), true); VisibleMessage message = new VisibleMessage(); message.setSentTimestamp(System.currentTimeMillis()); OpenGroupInvitation openGroupInvitationMessage = new OpenGroupInvitation(); - openGroupInvitationMessage.setGroupName(openGroup.getName()); - openGroupInvitationMessage.setGroupUrl(openGroup.getJoinURL()); + openGroupInvitationMessage.setName(openGroup.getName()); + openGroupInvitationMessage.setUrl(openGroup.getJoinURL()); message.setOpenGroupInvitation(openGroupInvitationMessage); OutgoingTextMessage outgoingTextMessage = OutgoingTextMessage.fromOpenGroupInvitation(openGroupInvitationMessage, recipient, message.getSentTimestamp()); - DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(-1, outgoingTextMessage, message.getSentTimestamp()); MessageSender.send(message, recipient.getAddress()); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java index 3826c28faf..81ec17bd0e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java @@ -48,7 +48,8 @@ public interface MmsSmsColumns { OUTGOING_CALL_TYPE}; - //TODO clean unused keys + // TODO: Clean unused keys + // Message attributes protected static final long MESSAGE_FORCE_SMS_BIT = 0x40; @@ -74,9 +75,10 @@ public interface MmsSmsColumns { protected static final long EXPIRATION_TIMER_UPDATE_BIT = 0x40000; protected static final long GROUP_UPDATE_MESSAGE_BIT = 0x80000; - // Data Extraction Information + // Data Extraction Notification protected static final long MEDIA_SAVED_EXTRACTION_BIT = 0x01000; protected static final long SCREENSHOT_EXTRACTION_BIT = 0x02000; + // Open Group Invitation protected static final long OPEN_GROUP_INVITATION_BIT = 0x04000; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index dc30c69bad..1651405d4c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -165,7 +165,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, mmsDatabase.endTransaction() } else { val smsDatabase = DatabaseFactory.getSmsDatabase(context) - val isOpenGroupInvitation = message.openGroupInvitation != null + val isOpenGroupInvitation = (message.openGroupInvitation != null) val insertResult = if (message.sender == getUserPublicKey()) { val textMessage = if (isOpenGroupInvitation) OutgoingTextMessage.fromOpenGroupInvitation(message.openGroupInvitation, targetRecipient, message.sentTimestamp) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java index 21d69d4770..35a10fce3c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java @@ -145,8 +145,6 @@ public abstract class DisplayRecord { return isMediaSavedExtraction() || isScreenshotExtraction(); } - // Open Group Invitation - public boolean isOpenGroupInvitation() { return MmsSmsColumns.Types.isOpenGroupInvitation(type); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index 98d13e8f5f..e1a26f1669 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -1,12 +1,11 @@ package org.thoughtcrime.securesms.loki.views import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color import android.util.AttributeSet import android.view.View -import android.widget.FrameLayout -import android.widget.ImageView -import android.widget.TextView -import android.widget.Toast +import android.widget.* import androidx.appcompat.app.AlertDialog import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -20,17 +19,12 @@ import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities class OpenGroupInvitationView : FrameLayout { - - companion object { - private const val TAG = "OpenGroupInvitationView" - } - private val joinButton: ImageView - private val openGroupIcon: ImageView - private val groupName: TextView - private val displayedUrl: TextView - - private var groupUrl: String = "" + private val openGroupIconContainer: RelativeLayout + private val openGroupIconImageView: ImageView + private val nameTextView: TextView + private val urlTextView: TextView + private var url: String = "" constructor(context: Context): this(context, null) @@ -38,40 +32,31 @@ class OpenGroupInvitationView : FrameLayout { constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int): super(context, attrs, defStyleAttr) { View.inflate(context, R.layout.open_group_invitation_view, this) - joinButton = findViewById(R.id.join_open_group) - openGroupIcon = findViewById(R.id.open_group_icon) - groupName = findViewById(R.id.group_name) - displayedUrl = findViewById(R.id.group_url) - - joinButton.setOnClickListener { joinPublicGroup(groupUrl) } + joinButton = findViewById(R.id.join_open_group_button) + openGroupIconContainer = findViewById(R.id.open_group_icon_image_view_container) + openGroupIconImageView = findViewById(R.id.open_group_icon_image_view) + nameTextView = findViewById(R.id.name_text_view) + urlTextView = findViewById(R.id.url_text_view) + joinButton.setOnClickListener { joinOpenGroup(url) } } fun setOpenGroup(name: String, url: String, isOutgoing: Boolean = false) { - groupName.text = name - displayedUrl.text = OpenGroupUrlParser.trimQueryParameter(url) - groupUrl = url - - if(isOutgoing) { - joinButton.visibility = View.GONE - openGroupIcon.visibility = View.VISIBLE - } else { - joinButton.visibility = View.VISIBLE - openGroupIcon.visibility = View.GONE - } + nameTextView.text = name + urlTextView.text = OpenGroupUrlParser.trimQueryParameter(url) + this.url = url + joinButton.visibility = if (isOutgoing) View.GONE else View.VISIBLE + openGroupIconContainer.visibility = if (isOutgoing) View.VISIBLE else View.GONE } - private fun joinPublicGroup(url: String) { + private fun joinOpenGroup(url: String) { val openGroup = OpenGroupUrlParser.parseUrl(url) val builder = AlertDialog.Builder(context) - builder.setTitle(context.getString(R.string.ConversationActivity_join_open_group, groupName.text.toString())) - builder.setIconAttribute(R.attr.dialog_info_icon) + builder.setTitle(context.getString(R.string.ConversationActivity_join_open_group, nameTextView.text.toString())) builder.setCancelable(true) - - var message: String = - context.getString(R.string.ConversationActivity_join_open_group_confirmation_message, groupName.text.toString()) - + val message: String = + context.getString(R.string.ConversationActivity_join_open_group_confirmation_message, nameTextView.text.toString()) builder.setMessage(message) - builder.setPositiveButton(R.string.yes) { dialog, which -> + builder.setPositiveButton(R.string.yes) { dialog, _ -> GlobalScope.launch(Dispatchers.IO) { try { dialog.dismiss() @@ -81,23 +66,14 @@ class OpenGroupInvitationView : FrameLayout { openGroup.room, openGroup.serverPublicKey ) - val threadID = GroupManager.getOpenGroupThreadID(group.id, context) - val groupID = GroupUtil.getEncodedOpenGroupID(group.id.toByteArray()) - MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(context) } catch (e: Exception) { - Log.e("JoinPublicChatActivity", "Failed to join open group.", e) - Toast.makeText( - context, - R.string.activity_join_public_chat_error, - Toast.LENGTH_SHORT - ).show() + Log.e("Loki", "Failed to join open group.", e) + Toast.makeText(context, R.string.activity_join_public_chat_error, Toast.LENGTH_SHORT).show() } } } - builder.setNegativeButton(R.string.no, null) builder.show() } - } \ No newline at end of file diff --git a/app/src/main/res/layout/open_group_invitation_view.xml b/app/src/main/res/layout/open_group_invitation_view.xml index 4074ca3174..2a360a4a62 100644 --- a/app/src/main/res/layout/open_group_invitation_view.xml +++ b/app/src/main/res/layout/open_group_invitation_view.xml @@ -1,73 +1,74 @@ - - + android:paddingHorizontal="@dimen/medium_spacing" + android:orientation="horizontal"> - - + android:background="@drawable/circle_tintable" + android:backgroundTint="#00E076"> + + + + + \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 6cd5a45cac..690143a188 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -12,7 +12,6 @@ import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; -import org.session.libsignal.utilities.logging.Log; public class IncomingTextMessage implements Parcelable { @@ -112,7 +111,11 @@ public class IncomingTextMessage implements Parcelable { public static IncomingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Address sender, Long sentTimestamp) { - String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON(); + String url = openGroupInvitation.getUrl(); + String name = openGroupInvitation.getName(); + if (url == null || name == null) { return null; } + // FIXME: Doing toJSON() to get the body here is weird + String body = UpdateMessageData.Companion.buildOpenGroupInvitation(url, name).toJSON(); IncomingTextMessage incomingTextMessage = new IncomingTextMessage(sender, 1, sentTimestamp, body, Optional.absent(), 0, false); incomingTextMessage.isOpenGroupInvitation = true; return incomingTextMessage; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java index c56c61ba6b..ac5b240404 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java @@ -6,14 +6,12 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.utilities.UpdateMessageData; public class OutgoingTextMessage { - private final Recipient recipient; private final String message; private final int subscriptionId; private final long expiresIn; private final long sentTimestampMillis; - - private boolean isOpenGroupInvitation = false; + private boolean isOpenGroupInvitation = false; public OutgoingTextMessage(Recipient recipient, String message, long expiresIn, int subscriptionId, long sentTimestampMillis) { this.recipient = recipient; @@ -28,7 +26,11 @@ public class OutgoingTextMessage { } public static OutgoingTextMessage fromOpenGroupInvitation(OpenGroupInvitation openGroupInvitation, Recipient recipient, Long sentTimestamp) { - String body = UpdateMessageData.Companion.buildOpenGroupInvitation(openGroupInvitation.getGroupUrl(), openGroupInvitation.getGroupName()).toJSON(); + String url = openGroupInvitation.getUrl(); + String name = openGroupInvitation.getName(); + if (url == null || name == null) { return null; } + // FIXME: Doing toJSON() to get the body here is weird + String body = UpdateMessageData.Companion.buildOpenGroupInvitation(url, name).toJSON(); OutgoingTextMessage outgoingTextMessage = new OutgoingTextMessage(recipient, body, 0, -1, sentTimestamp); outgoingTextMessage.isOpenGroupInvitation = true; return outgoingTextMessage; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt index 9896aec836..8c521df067 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -1,42 +1,37 @@ package org.session.libsession.messaging.messages.visible -import org.session.libsession.messaging.messages.control.ControlMessage import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.utilities.logging.Log class OpenGroupInvitation() { + var url: String? = null + var name: String? = null - var groupUrl: String? = null; - var groupName: String? = null; + fun isValid(): Boolean { + return (url != null && name != null) + } companion object { const val TAG = "OpenGroupInvitation" - fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation? { - val groupUrl = proto.url - val groupName = proto.name - return OpenGroupInvitation(groupUrl, groupName) + fun fromProto(proto: SignalServiceProtos.DataMessage.OpenGroupInvitation): OpenGroupInvitation { + return OpenGroupInvitation(proto.url, proto.name) } } constructor(url: String?, serverName: String?): this() { - this.groupUrl = url - this.groupName = serverName - } - - fun isValid(): Boolean { - return (groupUrl != null && groupName != null) + this.url = url + this.name = serverName } fun toProto(): SignalServiceProtos.DataMessage.OpenGroupInvitation? { val openGroupInvitationProto = SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() - openGroupInvitationProto.url = groupUrl - openGroupInvitationProto.name = groupName - + openGroupInvitationProto.url = url + openGroupInvitationProto.name = name return try { openGroupInvitationProto.build() } catch (e: Exception) { - Log.w(TAG, "Couldn't construct open group invitation proto from: $this") + Log.w(TAG, "Couldn't construct open group invitation proto from: $this.") null } } diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 1e5b77912e..864a919bd1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -58,9 +58,9 @@ class VisibleMessage : Message() { result.linkPreview = linkPreview } val openGroupInvitationProto = if (dataMessage.hasOpenGroupInvitation()) dataMessage.openGroupInvitation else null - openGroupInvitationProto?.let { + if (openGroupInvitationProto != null) { val openGroupInvitation = OpenGroupInvitation.fromProto(openGroupInvitationProto) - openGroupInvitation?.let { result.openGroupInvitation = openGroupInvitation} + result.openGroupInvitation = openGroupInvitation } // TODO Contact val profile = Profile.fromProto(dataMessage) @@ -73,7 +73,7 @@ class VisibleMessage : Message() { val proto = SignalServiceProtos.Content.newBuilder() val dataMessage: SignalServiceProtos.DataMessage.Builder // Profile - val profileProto = profile?.let { it.toProto() } + val profileProto = profile?.toProto() if (profileProto != null) { dataMessage = profileProto.toBuilder() } else { @@ -82,19 +82,19 @@ class VisibleMessage : Message() { // Text if (text != null) { dataMessage.body = text } // Quote - val quoteProto = quote?.let { it.toProto() } + val quoteProto = quote?.toProto() if (quoteProto != null) { dataMessage.quote = quoteProto } // Link preview - val linkPreviewProto = linkPreview?.let { it.toProto() } + val linkPreviewProto = linkPreview?.toProto() if (linkPreviewProto != null) { dataMessage.addAllPreview(listOf(linkPreviewProto)) } - //Open group invitation - openGroupInvitation?.let { - val openGroupInvitationProto = it.toProto() - if (openGroupInvitationProto != null) dataMessage.openGroupInvitation = openGroupInvitationProto + // Open group invitation + val openGroupInvitationProto = openGroupInvitation?.toProto() + if (openGroupInvitationProto != null) { + dataMessage.openGroupInvitation = openGroupInvitationProto } // Attachments val database = MessagingModuleConfiguration.shared.messageDataProvider diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 46c9d0390b..57c06af221 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -53,8 +53,7 @@ fun MessageReceiver.handle(message: Message, proto: SignalServiceProtos.Content, } } -//region ControlMessage - +// region Control Messages private fun MessageReceiver.handleReadReceipt(message: ReadReceipt) { val context = MessagingModuleConfiguration.shared.context SSKEnvironment.shared.readReceiptManager.processReadReceipts(context, message.sender!!, message.timestamps!!, message.receivedTimestamp!!) @@ -143,13 +142,9 @@ private fun handleConfigurationMessage(message: ConfigurationMessage) { } storage.addContacts(message.contacts) } - //endregion -//region VisibleMessage - -// Visible message handling - +// region Visible Messages fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalServiceProtos.Content, openGroupID: String?) { val storage = MessagingModuleConfiguration.shared.storage val context = MessagingModuleConfiguration.shared.context @@ -242,11 +237,9 @@ fun MessageReceiver.handleVisibleMessage(message: VisibleMessage, proto: SignalS //Notify the user if needed SSKEnvironment.shared.notificationManager.updateNotification(context, threadID) } - //endregion -//region ClosedGroupControlMessage - +// region Closed Groups private fun MessageReceiver.handleClosedGroupControlMessage(message: ClosedGroupControlMessage) { when (message.kind!!) { is ClosedGroupControlMessage.Kind.New -> handleNewClosedGroup(message) @@ -571,5 +564,4 @@ fun MessageReceiver.disableLocalGroupAndUnsubscribe(groupPublicKey: String, grou // Notify the PN server PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Unsubscribe, groupPublicKey, userPublicKey) } - -//endregion +// endregion diff --git a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt index 22e9abae2e..ac7f9ad64f 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/OpenGroupUrlParser.kt @@ -33,4 +33,4 @@ object OpenGroupUrlParser { } } -class V2OpenGroupInfo(val server: String, val room: String, val serverPublicKey: String) {} +class V2OpenGroupInfo(val server: String, val room: String, val serverPublicKey: String) From 77f0a54aec2372e4705a65665df30f638c551344 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 17 May 2021 15:49:44 +1000 Subject: [PATCH 19/29] Update version number --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 73a4e24d03..643c501598 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -158,8 +158,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.2' } -def canonicalVersionCode = 163 -def canonicalVersionName = "1.10.4" +def canonicalVersionCode = 164 +def canonicalVersionName = "1.10.5" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1, From a88322a0333dc1e2d20a6c0c5b5f9320de21812b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:12:33 +1000 Subject: [PATCH 20/29] Move files --- .../securesms/ApplicationContext.java | 8 +------- .../securesms/MediaDocumentsAdapter.java | 2 +- .../securesms/MediaPreviewActivity.java | 2 +- .../securesms/MessageDetailsActivity.java | 2 +- .../securesms/PassphrasePromptActivity.java | 2 +- .../PassphraseRequiredActionBarActivity.java | 2 +- .../thoughtcrime/securesms/ShareActivity.java | 3 +-- .../attachments/AttachmentServer.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 2 +- .../securesms/audio/AudioCodec.java | 2 +- .../securesms/audio/AudioRecorder.java | 6 +++--- .../securesms/audio/AudioSlidePlayer.java | 2 +- .../securesms/avatar/AvatarSelection.java | 6 +++--- .../securesms/backup/BackupDialog.java | 2 +- .../securesms/backup/BackupPassphrase.java | 2 +- .../securesms/backup/BackupPreferences.kt | 2 +- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/components/ComposeText.java | 2 +- .../components/CustomDefaultPreference.java | 2 +- .../components/GlideBitmapListeningTarget.java | 2 +- .../GlideDrawableListeningTarget.java | 2 +- .../securesms/components/InputPanel.java | 6 +++--- .../components/KeyboardAwareLinearLayout.java | 2 +- .../securesms/components/ThumbnailView.java | 8 ++++---- .../securesms/components/ZoomingImageView.java | 2 +- .../components/camera/CameraUtils.java | 2 +- .../components/camera/CameraView.java | 2 +- .../components/emoji/EmojiProvider.java | 2 +- .../components/emoji/MediaKeyboard.java | 2 +- .../components/emoji/RecentEmojiPageModel.java | 2 +- .../emoji/parsing/EmojiPageBitmap.java | 2 +- .../subsampling/AttachmentRegionDecoder.java | 2 +- .../conversation/ConversationActivity.java | 6 +++--- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../conversation/ConversationItem.java | 2 +- .../ConversationPopupActivity.java | 4 ++-- .../ClassicDecryptingPartInputStream.java | 2 +- .../securesms/database/AttachmentDatabase.java | 4 ++-- .../securesms/database/EarlyReceiptCache.java | 2 +- .../securesms/database/MessagingDatabase.java | 2 +- .../securesms/database/MmsDatabase.java | 2 +- .../securesms/database/PushDatabase.java | 2 +- .../securesms/database/RecipientDatabase.java | 9 ++------- .../securesms/database/SmsDatabase.java | 2 +- .../securesms/database/ThreadDatabase.java | 2 +- .../database/helpers/SQLCipherOpenHelper.java | 2 +- .../securesms/giph/net/GiphyLoader.java | 2 +- .../securesms/giph/ui/GiphyActivity.java | 2 +- .../securesms/giph/ui/GiphyAdapter.java | 2 +- .../glide/ChunkedImageUrlFetcher.java | 2 +- .../cache/EncryptedBitmapCacheDecoder.java | 2 +- .../cache/EncryptedBitmapResourceEncoder.java | 2 +- .../glide/cache/EncryptedCacheEncoder.java | 2 +- .../glide/cache/EncryptedGifCacheDecoder.java | 2 +- .../EncryptedGifDrawableResourceEncoder.java | 2 +- .../jobmanager/AlarmManagerScheduler.java | 2 +- .../securesms/jobmanager/InAppScheduler.java | 2 +- .../thoughtcrime/securesms/jobmanager/Job.java | 2 +- .../securesms/jobmanager/JobController.java | 2 +- .../securesms/jobmanager/JobManager.java | 2 +- .../securesms/jobmanager/JobRunner.java | 2 +- .../jobmanager/JobSchedulerScheduler.java | 2 +- .../jobmanager/impl/JsonDataSerializer.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 2 +- .../thoughtcrime/securesms/jobs/BaseJob.java | 2 +- .../securesms/jobs/LocalBackupJob.java | 4 ++-- .../jobs/RetrieveProfileAvatarJob.java | 2 +- .../securesms/jobs/TrimThreadJob.java | 2 +- .../securesms/jobs/UpdateApkJob.java | 2 +- .../linkpreview/LinkPreviewRepository.java | 2 +- .../securesms/logging/AndroidLogger.java | 2 +- .../securesms/logging/PersistentLogger.java | 8 ++++---- .../logging/UncaughtExceptionLogger.java | 2 +- .../loki/activities/BackupRestoreActivity.kt | 2 +- .../loki/activities/JoinPublicChatActivity.kt | 3 +-- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../securesms/loki/api/BackgroundPollWorker.kt | 2 +- .../loki/api/LokiPushNotificationManager.kt | 2 +- .../api/PrepareAttachmentAudioExtrasJob.kt | 2 +- .../loki/api/PublicChatInfoUpdateWorker.kt | 2 +- .../loki/api/PushNotificationService.kt | 2 +- .../securesms/loki/database/LokiAPIDatabase.kt | 2 +- .../loki/database/LokiUserDatabase.kt | 2 +- .../loki/database/SessionJobDatabase.kt | 2 +- .../fragments/ContactSelectionListFragment.kt | 2 +- .../securesms/loki/utilities/IP2Country.kt | 2 +- .../securesms/loki/views/MessageAudioView.kt | 3 +-- .../loki/views/OpenGroupInvitationView.kt | 6 +----- .../longmessage/LongMessageRepository.java | 2 +- .../securesms/mediasend/Camera1Controller.java | 2 +- .../securesms/mediasend/Camera1Fragment.java | 2 +- .../securesms/mediasend/MediaSendActivity.java | 2 +- .../securesms/mediasend/MediaSendFragment.java | 6 +++--- .../mediasend/MediaSendVideoFragment.java | 2 +- .../mediasend/MediaSendViewModel.java | 2 +- .../securesms/mms/AttachmentManager.java | 12 ++++++------ .../mms/AttachmentStreamLocalUriFetcher.java | 2 +- .../mms/DecryptableStreamLocalUriFetcher.java | 2 +- .../securesms/mms/DocumentSlide.java | 2 +- .../securesms/mms/MediaConstraints.java | 2 +- .../thoughtcrime/securesms/mms/QuoteId.java | 2 +- .../securesms/net/ChunkedDataFetcher.java | 2 +- .../net/ContentProxySafetyInterceptor.java | 2 +- .../securesms/net/ContentProxySelector.java | 2 +- .../AndroidAutoHeardReceiver.java | 2 +- .../AndroidAutoReplyReceiver.java | 2 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../notifications/MarkReadReceiver.java | 2 +- .../notifications/NotificationChannels.java | 2 +- .../notifications/NotificationState.java | 2 +- .../notifications/RemoteReplyReceiver.java | 2 +- .../SingleRecipientNotificationBuilder.java | 2 +- .../preferences/ChatsPreferenceFragment.java | 2 +- .../securesms/providers/BlobProvider.java | 2 +- .../securesms/providers/PartProvider.java | 2 +- .../securesms/qr/ScanningThread.java | 2 +- .../scribbles/ImageEditorFragment.java | 2 +- .../securesms/scribbles/StickerLoader.java | 2 +- .../securesms/search/SearchRepository.java | 2 +- .../securesms/service/DirectShareService.java | 2 +- .../service/ExpiringMessageManager.java | 2 +- .../service/GenericForegroundService.java | 2 +- .../securesms/service/KeyCachingService.java | 2 +- .../PersistentAlarmManagerListener.java | 2 +- .../PersistentConnectionBootListener.java | 2 +- .../service/QuickResponseService.java | 4 +--- .../service/UpdateApkReadyListener.java | 2 +- .../service/UpdateApkRefreshListener.java | 2 +- .../sskenvironment/ReadReceiptManager.kt | 2 +- .../sskenvironment/TypingStatusRepository.java | 2 +- .../securesms/util/AttachmentUtil.java | 2 +- .../thoughtcrime/securesms/util/BackupUtil.kt | 2 +- .../securesms/util/BitmapUtil.java | 2 +- .../thoughtcrime/securesms/util/DateUtils.java | 2 +- .../thoughtcrime/securesms/util/MediaUtil.java | 2 +- .../thoughtcrime/securesms/util/ResUtil.java | 2 +- .../securesms/util/SaveAttachmentTask.kt | 4 ++-- .../securesms/util/SingleLiveEvent.java | 2 +- .../securesms/util/SmsCharacterCalculator.java | 2 +- .../thoughtcrime/securesms/util/Stopwatch.java | 2 +- .../securesms/util/StreamUtil.java | 2 +- .../securesms/util/WakeLockUtil.java | 2 +- .../securesms/video/VideoPlayer.java | 2 +- .../thoughtcrime/securesms/BaseUnitTest.java | 2 +- .../securesms/logging/LogTest.java | 2 +- .../documents/IdentityKeyMismatch.java | 2 +- .../messaging/file_server/FileServerAPI.kt | 2 +- .../messaging/file_server/FileServerAPIV2.kt | 2 +- .../messaging/jobs/AttachmentDownloadJob.kt | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 4 +--- .../libsession/messaging/jobs/JobQueue.kt | 2 +- .../messaging/jobs/MessageReceiveJob.kt | 2 +- .../messaging/jobs/MessageSendJob.kt | 2 +- .../messaging/jobs/NotifyPNServerJob.kt | 2 +- .../control/ClosedGroupControlMessage.kt | 2 +- .../control/DataExtractionNotification.kt | 2 +- .../messages/control/ExpirationTimerUpdate.kt | 2 +- .../messaging/messages/control/ReadReceipt.kt | 2 +- .../messages/control/TypingIndicator.kt | 2 +- .../messaging/messages/visible/LinkPreview.kt | 2 +- .../messages/visible/OpenGroupInvitation.kt | 2 +- .../messaging/messages/visible/Profile.kt | 2 +- .../messaging/messages/visible/Quote.kt | 2 +- .../messages/visible/VisibleMessage.kt | 2 +- .../messaging/open_groups/OpenGroupAPI.kt | 4 +--- .../messaging/open_groups/OpenGroupAPIV2.kt | 2 +- .../messaging/open_groups/OpenGroupMessage.kt | 2 +- .../open_groups/OpenGroupMessageV2.kt | 2 +- .../messaging/open_groups/OpenGroupV2.kt | 2 +- .../sending_receiving/MessageEncrypter.kt | 2 +- .../sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../ReceivedMessageHandler.kt | 3 +-- .../notifications/PushNotificationAPI.kt | 2 +- .../pollers/ClosedGroupPoller.kt | 2 +- .../pollers/OpenGroupPoller.kt | 2 +- .../pollers/OpenGroupV2Poller.kt | 2 +- .../sending_receiving/pollers/Poller.kt | 2 +- .../threads/recipients/Recipient.java | 2 +- .../messaging/utilities/DotNetAPI.kt | 6 +----- .../messaging/utilities/MessageWrapper.kt | 3 +-- .../messaging/utilities/UpdateMessageData.kt | 2 +- .../libsession/snode/OnionRequestAPI.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../libsession/utilities/DownloadUtilities.kt | 2 +- .../utilities/TextSecurePreferences.kt | 2 +- .../libsession/utilities/ThemeUtil.java | 2 +- .../org/session/libsession/utilities/Util.kt | 2 +- .../session/libsession/utilities/ViewUtil.java | 7 ++----- .../concurrent/AssertedSuccessListener.java | 2 +- .../DynamicLanguageActivityHelper.java | 2 +- libsignal/src/main/AndroidManifest.xml | 5 +---- .../api/messages/SignalServiceEnvelope.java | 18 ------------------ .../internal/push/PushTransportDetails.java | 2 +- .../org/session/libsignal/service/loki/HTTP.kt | 2 +- .../ExternalStorageUtil.kt | 2 +- .../session/libsignal/utilities/JsonUtil.java | 10 ---------- .../{concurrent => }/ListenableFuture.java | 2 +- .../libsignal/utilities/{logging => }/Log.java | 2 +- .../NoExternalStorageException.java | 2 +- .../libsignal/utilities/PromiseUtilities.kt | 1 - .../{concurrent => }/SettableFuture.java | 2 +- 204 files changed, 228 insertions(+), 293 deletions(-) rename libsignal/src/main/java/org/session/libsignal/utilities/{externalstorage => }/ExternalStorageUtil.kt (97%) rename libsignal/src/main/java/org/session/libsignal/utilities/{concurrent => }/ListenableFuture.java (85%) rename libsignal/src/main/java/org/session/libsignal/utilities/{logging => }/Log.java (98%) rename libsignal/src/main/java/org/session/libsignal/utilities/{externalstorage => }/NoExternalStorageException.java (95%) rename libsignal/src/main/java/org/session/libsignal/utilities/{concurrent => }/SettableFuture.java (98%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 2e8294b565..f57a6e40ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -33,7 +33,6 @@ import org.conscrypt.Conscrypt; import org.session.libsession.messaging.MessagingModuleConfiguration; import org.session.libsession.messaging.avatars.AvatarHelper; import org.session.libsession.messaging.file_server.FileServerAPI; -import org.session.libsession.messaging.jobs.JobQueue; import org.session.libsession.messaging.mentions.MentionsManager; import org.session.libsession.messaging.open_groups.OpenGroupAPI; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; @@ -49,10 +48,9 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper; import org.session.libsession.utilities.dynamiclanguage.LocaleParser; import org.session.libsession.utilities.preferences.ProfileKeyUtil; -import org.session.libsignal.service.api.util.StreamDetails; import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; import org.session.libsignal.utilities.ThreadUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.signal.aesgcmprovider.AesGcmProvider; import org.thoughtcrime.securesms.components.TypingStatusSender; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -93,10 +91,7 @@ import org.webrtc.voiceengine.WebRtcAudioManager; import org.webrtc.voiceengine.WebRtcAudioUtils; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; -import java.security.SecureRandom; import java.security.Security; import java.util.Date; import java.util.HashSet; @@ -104,7 +99,6 @@ import java.util.Set; import dagger.ObjectGraph; import kotlin.Unit; -import kotlin.jvm.functions.Function1; import kotlinx.coroutines.Job; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java index 6e69e78d08..bbc00472a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.MediaDocumentsAdapter.ViewHolder; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; import org.thoughtcrime.securesms.database.MediaDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.DocumentSlide; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.Slide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 6edfca5e9d..ba2b2722c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -58,7 +58,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.components.MediaView; import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index 5789d6f791..707a522007 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -55,7 +55,7 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; import org.thoughtcrime.securesms.mms.GlideApp; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java index ad75d60330..df61907714 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -41,7 +41,7 @@ import androidx.core.os.CancellationSignal; import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.components.AnimatingToggle; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.service.KeyCachingService; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 4cc0210a1d..d4e836ae4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -11,7 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.loki.activities.LandingActivity; import org.thoughtcrime.securesms.service.KeyCachingService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java index 9c873eb6db..68614fe92d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java @@ -40,8 +40,7 @@ import org.thoughtcrime.securesms.components.SearchToolbar; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment; import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListLoader.DisplayMode; import org.thoughtcrime.securesms.mediasend.Media; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java index 96e615824d..e186007ee3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java @@ -5,7 +5,7 @@ import android.content.Context; import android.net.Uri; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.session.libsignal.utilities.Hex; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 1bc9e43de0..43bf135274 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -15,7 +15,7 @@ import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.AttachmentDatabase import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java index 257218f147..ff3b0b809a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java @@ -8,7 +8,7 @@ import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.media.MediaRecorder; import android.os.Build; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java index a2c7080518..35cbf16b63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -8,7 +8,7 @@ import android.os.ParcelFileDescriptor; import androidx.annotation.NonNull; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import org.thoughtcrime.securesms.providers.BlobProvider; @@ -16,8 +16,8 @@ import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsignal.utilities.ThreadUtils; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index 1af511583c..a33b8748a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -34,7 +34,7 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import org.jetbrains.annotations.NotNull; import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.session.libsession.utilities.ServiceUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java index ea016ff3c4..b0fbd8e22f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java @@ -16,9 +16,9 @@ import androidx.core.content.ContextCompat; import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.NoExternalStorageException; +import org.session.libsignal.utilities.Log; +import org.session.libsignal.utilities.ExternalStorageUtil; import org.thoughtcrime.securesms.util.FileProviderUtil; import org.thoughtcrime.securesms.util.IntentUtils; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java index 41cd8afdf7..76342898b1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.BackupDirSelector; import org.thoughtcrime.securesms.util.BackupUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java index e834454ad1..eec2a2e588 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.crypto.KeyStoreHelper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt index 4ca3ed3f6f..8ddfc23a8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt @@ -6,7 +6,7 @@ import android.os.Build import android.preference.PreferenceManager import android.preference.PreferenceManager.getDefaultSharedPreferencesName import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_BOOLEAN import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_INT import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 9d1c012fb5..2d0e2fca33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream import org.thoughtcrime.securesms.database.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase import org.thoughtcrime.securesms.util.BackupUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index 0452f32b41..9d82e9c7e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.backup.BackupProtos.* import org.thoughtcrime.securesms.crypto.AttachmentSecret import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream import org.thoughtcrime.securesms.database.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.messaging.avatars.AvatarHelper diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java index ca94a82037..012086dc94 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java @@ -23,7 +23,7 @@ import androidx.core.view.inputmethod.InputConnectionCompat; import androidx.core.view.inputmethod.InputContentInfoCompat; import org.thoughtcrime.securesms.components.emoji.EmojiEditText; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; public class ComposeText extends EmojiEditText { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java index 44e3ba60b8..178803a9f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java @@ -12,7 +12,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.View; import android.widget.AdapterView; import android.widget.Button; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java index ea5103dc12..61094fb7df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java @@ -8,7 +8,7 @@ import android.widget.ImageView; import com.bumptech.glide.request.target.BitmapImageViewTarget; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.SettableFuture; public class GlideBitmapListeningTarget extends BitmapImageViewTarget { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java index 0c8b502448..d177900124 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java @@ -7,7 +7,7 @@ import android.widget.ImageView; import com.bumptech.glide.request.target.DrawableImageViewTarget; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.SettableFuture; public class GlideDrawableListeningTarget extends DrawableImageViewTarget { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 5a67ee67ab..05e91b9e17 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java @@ -25,7 +25,7 @@ import android.widget.Toast; import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider; import org.thoughtcrime.securesms.components.emoji.EmojiToggle; import org.thoughtcrime.securesms.components.emoji.MediaKeyboard; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.SlideDeck; @@ -37,8 +37,8 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.AssertedSuccessListener; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import org.session.libsignal.libsignal.util.guava.Optional; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java index e88e91703d..338b801770 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java @@ -24,7 +24,7 @@ import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; import androidx.appcompat.widget.LinearLayoutCompat; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.Surface; import android.view.View; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 2628f031dc..8546d95601 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -8,7 +8,7 @@ import androidx.annotation.UiThread; import android.util.AttributeSet; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -23,7 +23,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import network.loki.messenger.R; -import org.thoughtcrime.securesms.database.AttachmentDatabase; + import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.GlideRequest; import org.thoughtcrime.securesms.mms.GlideRequests; @@ -34,8 +34,8 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.util.Collections; import java.util.Locale; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java index 507a99e05a..265f707df9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import android.view.View; import android.widget.FrameLayout; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java index b929871d2b..1aea994a98 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java @@ -8,7 +8,7 @@ import android.hardware.Camera.Size; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.DisplayMetrics; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.Surface; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java index 7ec7683b1a..f072960c65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -32,7 +32,7 @@ import android.os.Build.VERSION; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.OrientationEventListener; import android.view.ViewGroup; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 3e417e107a..76dfe1bf13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.FutureTaskListener; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java index 42a1e09f87..0aa3c33c71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java @@ -16,7 +16,7 @@ import android.widget.FrameLayout; import org.thoughtcrime.securesms.components.InputAwareLayout.InputView; import org.thoughtcrime.securesms.components.RepeatableImageKey; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 447d062ccb..ec6babe405 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.TypeFactory; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.JsonUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index 763062e78c..a01e8f329f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.components.emoji.EmojiPageModel; import org.thoughtcrime.securesms.util.Stopwatch; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java index 60669714b7..f7b1724504 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java @@ -12,7 +12,7 @@ import android.net.Uri; import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder; import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 8143b5df5f..f6a32654ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -117,9 +117,9 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.loki.Mention; import org.session.libsignal.service.loki.utilities.HexEncodingKt; import org.session.libsignal.service.loki.utilities.PublicKeyValidation; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ExpirationDialog; import org.thoughtcrime.securesms.MediaOverviewActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index f2b2d38b70..b748a0945f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.SlideDeck; import org.session.libsession.messaging.threads.recipients.Recipient; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index dae7408bb9..91b45536a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -78,7 +78,7 @@ import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.SimpleTask; import org.session.libsession.utilities.task.ProgressDialogAsyncTask; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.MessageDetailsActivity; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 1b7d11e743..b8acb80571 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -71,7 +71,7 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.BindableConversationItem; import org.thoughtcrime.securesms.MediaPreviewActivity; import org.thoughtcrime.securesms.MessageDetailsActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java index 7807d2820d..f288ac5ba5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java @@ -12,8 +12,8 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.WindowManager; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsignal.utilities.concurrent.ListenableFuture; +import org.session.libsignal.utilities.Log; +import org.session.libsignal.utilities.ListenableFuture; import java.util.concurrent.ExecutionException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java index 0a24003db5..a8800a2507 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.crypto; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.LimitedInputStream; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 59b7f52c7d..4b20ee202e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -45,8 +45,8 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.utilities.MediaTypes; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.JsonUtil; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ExternalStorageUtil; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java index 7c7a292d0c..ac21ff3bed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.util.LRUCache; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java index 5c92b976f5..026d6b48a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java @@ -11,7 +11,7 @@ import org.session.libsession.database.documents.Document; import org.session.libsession.database.documents.IdentityKeyMismatch; import org.session.libsession.database.documents.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.IdentityKey; import org.session.libsession.messaging.threads.Address; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 84ad24c601..3d6510dcaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -68,7 +68,7 @@ import org.session.libsignal.utilities.JsonUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.util.guava.Optional; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 73a361ae55..6d63e2797a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -4,7 +4,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 20c9fe83f3..316822b406 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.net.Uri; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -20,16 +20,11 @@ import org.session.libsignal.utilities.Base64; import org.session.libsession.utilities.Util; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.Closeable; import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; import java.util.List; -import java.util.Map; -import java.util.Set; public class RecipientDatabase extends Database { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 1da23548da..15dc6003cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -28,7 +28,7 @@ import com.annimon.stream.Stream; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteStatement; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.session.libsession.database.documents.IdentityKeyMismatch; import org.session.libsession.database.documents.IdentityKeyMismatchList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 1ebfa6146b..f70ebabd11 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -41,7 +41,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.libsignal.util.Pair; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index ef04bedbb7..034fd7f521 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase; import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java index 7de0aa4ad9..c908dd8d23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java @@ -6,7 +6,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.text.TextUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.giph.model.GiphyImage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index adbc8a86b8..dcfdb66112 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -20,7 +20,7 @@ import com.google.android.material.tabs.TabLayout; import org.session.libsession.utilities.MediaTypes; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.providers.BlobProvider; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 41298ec0bf..a955f368fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java index 8d6002dbdc..15628245a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java @@ -8,7 +8,7 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.net.ChunkedDataFetcher; import org.thoughtcrime.securesms.net.RequestController; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java index abefc3a10f..91f2cb2f26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java index 91833cc485..e10e3ecc6e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java index 3fc1040a20..c5f91ae2ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java @@ -7,7 +7,7 @@ import com.bumptech.glide.load.Encoder; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java index 4bed667cf0..24a678c8fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java index b4efbd822f..a208e81c3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java index 605ff7f2e4..62f2ee6b27 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java @@ -12,7 +12,7 @@ import com.annimon.stream.Stream; import org.thoughtcrime.securesms.ApplicationContext; import network.loki.messenger.BuildConfig; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; import java.util.UUID; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java index 0cd295824c..b0f314eaa6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java index d82e851f39..990207779d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java @@ -6,7 +6,7 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java index 17be996b3c..c2a8b4f553 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec; import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java index 6b101faed2..49159ef7e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -9,7 +9,7 @@ import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory; import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java index 768ff39c70..6eadf0fd5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.WakeLockUtil; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java index a42e64e861..40acbf520b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.ApplicationContext; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java index 87854452a5..e4342e717c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.JsonUtil; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index e79db7d00e..e1782e271f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -12,7 +12,7 @@ import org.session.libsession.messaging.threads.GroupRecord; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java index 3bd16d0d1f..0c11cc552b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JobLogger; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; /** * @deprecated diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java index f8e0c531f7..147db87ce5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; import org.thoughtcrime.securesms.jobmanager.Job; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.database.BackupFileRecord; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.service.GenericForegroundService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 26e3280f98..36baa2860d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -15,7 +15,7 @@ import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; import org.session.libsignal.service.api.push.exceptions.PushNetworkException; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java index bbd51c8837..45f037d453 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.jobmanager.Job; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java index 81e34b5a58..5b4ce8d13c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.service.UpdateApkReadyListener; import org.session.libsession.utilities.FileUtils; import org.session.libsignal.utilities.Hex; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index e60d5821af..c2a9def90c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -13,7 +13,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.utilities.MediaTypes; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.dependencies.InjectableType; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.net.CallRequestController; import org.thoughtcrime.securesms.net.CompositeRequestController; import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java index f54d43cc34..d62aac647c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class AndroidLogger extends Log.Logger { diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java index f08797a7d0..ecb4b68983 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java @@ -4,11 +4,11 @@ import android.content.Context; import androidx.annotation.AnyThread; import androidx.annotation.WorkerThread; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; +import org.session.libsignal.utilities.Log; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java index 553bc47f8f..59c1bf39e6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt index 9811c70bf2..6450115184 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.backup.FullBackupImporter import org.thoughtcrime.securesms.backup.FullBackupImporter.DatabaseDowngradeException import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider import org.thoughtcrime.securesms.database.DatabaseFactory -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo import org.thoughtcrime.securesms.loki.utilities.show import org.thoughtcrime.securesms.notifications.NotificationChannels diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt index bbe7bbe8e4..7527b68c4f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt @@ -10,7 +10,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager -import android.widget.GridLayout import android.widget.Toast import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory import androidx.core.view.isVisible @@ -29,7 +28,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.DistributionTypes import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index 2d6854f774..b9d8a9b0eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -30,7 +30,7 @@ import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.service.loki.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt index 86970cbcdc..c6cd6f6a4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt @@ -14,7 +14,7 @@ import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPolle import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupV2Poller import org.session.libsession.snode.SnodeAPI import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.DatabaseFactory import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt index 905a58461b..40b99df2e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.notifications.PushNoti import org.session.libsession.snode.OnionRequestAPI import org.thoughtcrime.securesms.database.DatabaseFactory import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.utilities.retryIfNeeded diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt index dc97760758..6c1a96d1de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.api import android.media.MediaDataSource import android.os.Build -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import androidx.annotation.RequiresApi import org.greenrobot.eventbus.EventBus import org.session.libsession.messaging.utilities.Data diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt index 2badd9c6d9..7880efbc55 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.api import android.content.Context import androidx.work.* import org.session.libsession.messaging.open_groups.OpenGroup -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt index ebe9baf29c..d274a1ba62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.notifications.NotificationChannels class PushNotificationService : FirebaseMessagingService() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index bc53e1534d..fac748efc4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -13,7 +13,7 @@ import org.session.libsignal.service.loki.utilities.PublicKeyValidation import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.loki.utilities.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt index cea0f52d9f..1d2cb01442 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.database import android.content.ContentValues import android.content.Context import android.database.sqlite.SQLiteDatabase -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt index c5e5e102ce..55409e1a5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt @@ -5,7 +5,7 @@ import android.content.Context import net.sqlcipher.Cursor import org.session.libsession.messaging.jobs.* import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt index 3c7e2bdc76..063dbc30c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt @@ -12,7 +12,7 @@ import android.view.ViewGroup import kotlinx.android.synthetic.main.contact_selection_list_fragment.* import network.loki.messenger.R import org.thoughtcrime.securesms.contacts.ContactsCursorLoader -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.mms.GlideApp import org.session.libsession.messaging.threads.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt index 855ca52240..c3070a16e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import androidx.localbroadcastmanager.content.LocalBroadcastManager -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import com.opencsv.CSVReader import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.ThreadUtils diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt index 9c79d2dc3c..76f5dee9c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt @@ -25,10 +25,9 @@ import org.thoughtcrime.securesms.ApplicationContext import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.thoughtcrime.securesms.audio.AudioSlidePlayer import org.thoughtcrime.securesms.components.AnimatingToggle -import org.thoughtcrime.securesms.database.AttachmentDatabase import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.events.PartProgressEvent -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.api.PrepareAttachmentAudioExtrasJob import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.thoughtcrime.securesms.mms.AudioSlide diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index e1a26f1669..32736ad7fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -1,8 +1,6 @@ package org.thoughtcrime.securesms.loki.views import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.util.AttributeSet import android.view.View import android.widget.* @@ -11,10 +9,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import network.loki.messenger.R -import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.OpenGroupUrlParser -import org.session.libsignal.utilities.logging.Log -import org.thoughtcrime.securesms.groups.GroupManager +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index cee13fb9df..1cc6e0bbd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.TextSlide; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java index 5517f86bed..2c14ed8d5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java @@ -5,7 +5,7 @@ import android.hardware.Camera; import androidx.annotation.NonNull; import android.view.Surface; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index d0daa6a1ec..ee11c12bc5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -35,7 +35,7 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.session.libsession.utilities.ServiceUtil; import org.thoughtcrime.securesms.util.Stopwatch; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 381d28c8b7..191eca74ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -23,7 +23,7 @@ import androidx.lifecycle.ViewModelProvider; import org.session.libsession.utilities.MediaTypes; import org.session.libsignal.libsignal.util.guava.Optional; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 1685459cc9..34b4c6c0e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiToggle; import org.thoughtcrime.securesms.components.emoji.MediaKeyboard; import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.imageeditor.model.EditorModel; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.providers.BlobProvider; @@ -52,8 +52,8 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java index 268741be1d..5e4ee5f3e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.VideoSlide; import org.thoughtcrime.securesms.video.VideoPlayer; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index a0d8b40c79..89b0f4aa9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -12,7 +12,7 @@ import android.text.TextUtils; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.util.MediaUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index 123f3bc5e1..efad3ef832 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -42,13 +42,13 @@ import org.thoughtcrime.securesms.loki.views.MessageAudioView; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.components.RemovableEditableMediaView; import org.thoughtcrime.securesms.components.ThumbnailView; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; import org.thoughtcrime.securesms.giph.ui.GiphyActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediasend.MediaSendActivity; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.providers.BlobProvider; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.ExternalStorageUtil; import org.thoughtcrime.securesms.util.FileProviderUtil; import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsignal.libsignal.util.guava.Optional; @@ -58,9 +58,9 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.ListenableFuture.Listener; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.ListenableFuture.Listener; +import org.session.libsignal.utilities.SettableFuture; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 2a018a442c..85f826d3b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -6,7 +6,7 @@ import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.InvalidMessageException; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java index e9f16b9bbb..1264363093 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java @@ -4,7 +4,7 @@ import android.content.ContentResolver; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.data.StreamLocalUriFetcher; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java index 4021fc8eda..7e1c0b871d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.ExternalStorageUtil; public class DocumentSlide extends Slide { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java index fe823042ed..f1d5a5ec57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java index 1bafc5d7cc..39f4a71faa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java @@ -7,7 +7,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; /** * Represents the information required to find the {@link MessageRecord} pointed to by a quote. diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index 654e997aaf..5319cc6bfc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -6,7 +6,7 @@ import android.text.TextUtils; import com.annimon.stream.Stream; import com.bumptech.glide.util.ContentLengthInputStream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; import org.session.libsignal.libsignal.util.Pair; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java index 721006dcbd..983a3374ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java index 01298ad698..e4e57d01de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.net; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java index 4548a6c776..ffe6df439e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java @@ -27,7 +27,7 @@ import androidx.core.app.NotificationManagerCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index 4aacc56cac..e0d600e99d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.mms.MmsException; import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index cf96ace8ce..000327b351 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -45,7 +45,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.service.internal.util.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.conversation.ConversationActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 042f106c55..8483694af3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.ExpirationInfo; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; import org.thoughtcrime.securesms.service.ExpiringMessageManager; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java index ab73ee285d..335e857c2b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java @@ -29,7 +29,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient.*; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java index 0ec5814640..dc000650d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.conversation.ConversationPopupActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient.*; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index f49f5893e8..d6100876bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -28,7 +28,7 @@ import androidx.core.app.RemoteInput; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.sending_receiving.MessageSender; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 0a0bce0059..c777d507d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -28,7 +28,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.GeneratedContactPhoto; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index f00087a73d..b7d013d6e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -10,7 +10,7 @@ import androidx.preference.EditTextPreference; import androidx.preference.Preference; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.Trimmer; diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java index e8a01008c5..6d900a5b37 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java index a2d574b127..f49802073a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java @@ -28,7 +28,7 @@ import android.os.ParcelFileDescriptor; import android.provider.OpenableColumns; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java index 57af8ff7ad..4e86941c5b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java +++ b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java @@ -16,7 +16,7 @@ import com.google.zxing.qrcode.QRCodeReader; import org.thoughtcrime.securesms.components.camera.CameraView; import org.thoughtcrime.securesms.components.camera.CameraView.PreviewFrame; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index be079a806b..39b75c7a82 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.imageeditor.Renderer; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; import org.thoughtcrime.securesms.imageeditor.model.EditorModel; import org.thoughtcrime.securesms.imageeditor.renderers.TextRenderer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediasend.MediaSendPageFragment; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.mms.PushMediaConstraints; diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java index 94152dd0db..39d5238b23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.AsyncLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java index 53497db6a1..6ff68b87ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.search.model.MessageResult; import org.thoughtcrime.securesms.search.model.SearchResult; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java index 21c1adcff9..7fe08f764c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.ShareActivity; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 05fed4b9d8..bf2cf9d77f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -13,7 +13,7 @@ import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java index 4c942e341b..02db92fc90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -12,7 +12,7 @@ import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; import androidx.core.content.ContextCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.session.libsignal.libsignal.util.guava.Preconditions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index e204c3f503..c4507cd766 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -36,7 +36,7 @@ import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.DatabaseUpgradeActivity; import org.thoughtcrime.securesms.DummyActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.session.libsession.utilities.ServiceUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java index 90303be722..4091d953af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java @@ -6,7 +6,7 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public abstract class PersistentAlarmManagerListener extends BroadcastReceiver { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java index 47de3311ec..38fbf886ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class PersistentConnectionBootListener extends BroadcastReceiver { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java index ada9bb2513..89f218faf6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java @@ -10,10 +10,8 @@ import network.loki.messenger.R; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.Address; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.sending_receiving.MessageSender; -import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.thoughtcrime.securesms.util.Rfc5724Uri; import java.net.URISyntaxException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 19ff039eb0..323617d81d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -12,7 +12,7 @@ import android.net.Uri; import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import network.loki.messenger.R; import org.thoughtcrime.securesms.notifications.NotificationChannels; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java index 2f15f84118..187713df95 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt index 729f7c3b4d..d5adfe9f15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt @@ -4,7 +4,7 @@ import android.content.Context import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java index 40ee73983a..1bb1b52434 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java @@ -15,7 +15,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java index 5a58739aca..13cdcc6d6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -16,7 +16,7 @@ import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.Set; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt index 236b37a8a2..6b3d1fabce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt @@ -15,7 +15,7 @@ import network.loki.messenger.R import org.greenrobot.eventbus.EventBus import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.ByteUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.backup.BackupEvent import org.thoughtcrime.securesms.backup.BackupPassphrase import org.thoughtcrime.securesms.backup.BackupProtos.SharedPreference diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java index 94c63ceaa0..3bb0d2db21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java @@ -19,7 +19,7 @@ import android.util.Pair; import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.MediaConstraints; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java index 7f8c44c498..cb822f1eeb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java @@ -24,7 +24,7 @@ import androidx.annotation.Nullable; import android.os.Build; import android.text.format.DateFormat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 3c55996d64..5c4894c12b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -17,7 +17,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.DocumentSlide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java index 7ea1762068..dff1a419de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java @@ -31,7 +31,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class ResUtil { private static final String TAG = ResUtil.class.getSimpleName(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index e42ae3c3d3..59658f12a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -15,8 +15,8 @@ import android.widget.Toast import androidx.appcompat.app.AlertDialog import network.loki.messenger.R import org.session.libsession.utilities.task.ProgressDialogAsyncTask -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.ExternalStorageUtil +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.mms.PartAuthority import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java index 711a8b9ffb..97b52c9b9f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java @@ -23,7 +23,7 @@ import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java index 9107e99555..5bac6ec95c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.telephony.SmsMessage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class SmsCharacterCalculator extends CharacterCalculator { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java index fad0d63892..cac53899fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java index 32c381c00a..1f32748155 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java index c3e7654c88..bba19f1fc2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java @@ -6,7 +6,7 @@ import android.os.PowerManager.WakeLock; import androidx.annotation.NonNull; import org.session.libsession.utilities.ServiceUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class WakeLockUtil { diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java index bac240616c..08d3a52a2f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -49,7 +49,7 @@ import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.VideoSlide; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java b/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java index c49b4ed98d..8a309b530a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java @@ -6,7 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; import android.text.TextUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java b/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java index ea1dd3a588..c4b525b37f 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.logging; import org.junit.Test; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import static org.junit.Assert.assertEquals; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java index 3140ba2bdf..1f1517e841 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java +++ b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java @@ -1,6 +1,6 @@ package org.session.libsession.database.documents; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt index b4a1861875..a1b33b60b8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt @@ -5,7 +5,7 @@ import nl.komponents.kovenant.functional.map import okhttp3.Request import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt index 89bea6bc88..619b78aced 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt @@ -11,7 +11,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.service.loki.HTTP import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log object FileServerAPIV2 { diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index d4ee80a47d..0a6666230f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.DownloadUtilities import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.File import java.io.FileInputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index 4f76bb9b9b..ae81540052 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -4,7 +4,6 @@ import com.esotericsoftware.kryo.Kryo import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import nl.komponents.kovenant.Promise -import okhttp3.MultipartBody import okio.Buffer import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.file_server.FileServerAPI @@ -22,8 +21,7 @@ import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputSt import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.util.Util import org.session.libsignal.service.loki.PlaintextOutputStreamFactory -import org.session.libsignal.utilities.logging.Log -import java.util.* +import org.session.libsignal.utilities.Log class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val message: Message, val messageSendJobID: String) : Job { override var delegate: JobDelegate? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt index 1fdf100a3f..147a9f1078 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.lang.IllegalStateException import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt index 256091ada4..7910861d83 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt @@ -5,7 +5,7 @@ import nl.komponents.kovenant.deferred import org.session.libsession.messaging.sending_receiving.MessageReceiver import org.session.libsession.messaging.sending_receiving.handle import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job { override var delegate: JobDelegate? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt index 2989155314..71a28ffdb4 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class MessageSendJob(val message: Message, val destination: Destination) : Job { diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt index 0445eaf8f5..f1dd2fe091 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt @@ -13,7 +13,7 @@ import org.session.libsession.messaging.utilities.Data import org.session.libsession.snode.SnodeMessage import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.utilities.retryIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 0d2403cd24..38e505c3e8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -13,7 +13,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessa import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class ClosedGroupControlMessage() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt index 90cc803713..a58cb8166b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class DataExtractionNotification() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt index 9aa777782a..5ce55ed832 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class ExpirationTimerUpdate() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt index 1f4bc84e3e..d27dc1f732 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class ReadReceipt() : ControlMessage() { var timestamps: List? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt index a06f821cb8..649a93308e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class TypingIndicator() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt index 10c41b18b6..91c68779c6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class LinkPreview() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt index 8c521df067..f26ce81dde 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class OpenGroupInvitation() { var url: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt index 98cb5ecafb..bc79381ebc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.visible import com.google.protobuf.ByteString -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class Profile() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt index 376f52fd25..69f2300a01 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt @@ -4,7 +4,7 @@ import com.goterl.lazycode.lazysodium.BuildConfig import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class Quote() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 864a919bd1..298ccdf006 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment class VisibleMessage : Message() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt index 0aba366d9f..4911598221 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt @@ -1,6 +1,5 @@ package org.session.libsession.messaging.open_groups -import nl.komponents.kovenant.Kovenant import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred import nl.komponents.kovenant.functional.map @@ -12,9 +11,8 @@ import org.session.libsession.utilities.DownloadUtilities import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.ByteArrayOutputStream -import java.io.IOException import java.text.SimpleDateFormat import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index f2f5d62551..2bdbd9daf6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -22,7 +22,7 @@ import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64.* import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt index 492cb4f7c7..5ccf65377a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt @@ -4,7 +4,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 data class OpenGroupMessage( diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 1b75c1224b..49fa9c76b5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -5,7 +5,7 @@ import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 data class OpenGroupMessageV2( diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt index 1e766a42ed..6eb964e9ef 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* data class OpenGroupV2( diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt index 287fa0cef4..1745e2edee 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt @@ -11,7 +11,7 @@ import org.session.libsession.utilities.KeyPairUtilities import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log object MessageEncrypter { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 4477633c16..483c3b98a2 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -25,7 +25,7 @@ import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.lang.IllegalStateException import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreview diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index f42127762c..e677a2534b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -21,7 +21,7 @@ import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.ThreadUtils -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 57c06af221..7ec058a64f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -7,7 +7,6 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.Attachment -import org.session.libsession.messaging.messages.visible.OpenGroupInvitation import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage @@ -30,7 +29,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.MessageDigest import java.util.* import kotlin.collections.ArrayList diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt index 76a93ac344..f10343be17 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log @SuppressLint("StaticFieldLeak") object PushNotificationAPI { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt index b9093e94cd..09c698691d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsignal.service.loki.utilities.getRandomElementOrNull -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground class ClosedGroupPoller { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt index 309bfa20bb..9c3b3f582f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt @@ -12,7 +12,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupMessage import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.* import java.util.concurrent.ScheduledExecutorService diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt index 439b1c3400..ab84252805 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledFuture diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt index 805bac8a8c..f1298d2699 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsession.snode.SnodeModule import org.session.libsignal.service.loki.Snode -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.SecureRandom import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java index 9a85c75c7c..1d18543c86 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java @@ -36,7 +36,7 @@ import org.session.libsession.messaging.threads.recipients.RecipientProvider.Rec import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.color.MaterialColor; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index c3ad4c368b..2f5b16048a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -12,7 +12,6 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.utilities.DiffieHellman import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream -import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails @@ -26,10 +25,7 @@ import org.session.libsignal.service.loki.HTTP import org.session.libsignal.service.loki.utilities.* import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log -import java.io.File -import java.io.FileOutputStream -import java.io.OutputStream +import org.session.libsignal.utilities.Log import java.util.* /** diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt index 767e4beffe..f90381b2f7 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt @@ -1,8 +1,7 @@ package org.session.libsession.messaging.utilities import com.google.protobuf.ByteString -import org.session.libsignal.metadata.SignalProtos -import org.session.libsignal.utilities.logging.Log +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 diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt index 062576ea6c..e5063bd69f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.core.JsonParseException import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* // class used to save update messages details diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index c3e454e6bc..b983815a85 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -8,7 +8,7 @@ import nl.komponents.kovenant.functional.map import okhttp3.Request import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.utilities.AESGCM -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.* import org.session.libsignal.service.loki.Snode diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index ab73604385..b52cb9cd6b 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -17,7 +17,7 @@ import org.session.libsignal.service.loki.utilities.prettifiedDescription import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.SecureRandom object SnodeAPI { diff --git a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt index fc2375c1c8..6067cef770 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt @@ -5,7 +5,7 @@ import okhttp3.Request import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt index ea7de544be..bf67c45e9b 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow import org.session.libsession.R import org.session.libsession.utilities.preferences.NotificationPrivacyPreference -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.IOException import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java index 6aaad6a050..cf9eb05d08 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import androidx.appcompat.view.ContextThemeWrapper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.R; diff --git a/libsession/src/main/java/org/session/libsession/utilities/Util.kt b/libsession/src/main/java/org/session/libsession/utilities/Util.kt index 4f52b9c46c..14a2cc9001 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/Util.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/Util.kt @@ -11,7 +11,7 @@ import android.text.Spannable import android.text.SpannableString import android.text.TextUtils import android.text.style.StyleSpan -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import java.io.* import java.nio.charset.StandardCharsets diff --git a/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java b/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java index c962ebe53b..202e184ef4 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java @@ -16,13 +16,11 @@ */ package org.session.libsession.utilities; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,7 +28,6 @@ import android.view.ViewStub; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.widget.LinearLayout.LayoutParams; -import android.widget.TextView; import androidx.annotation.IdRes; import androidx.annotation.LayoutRes; @@ -39,8 +36,8 @@ import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import org.session.libsession.utilities.views.Stub; public class ViewUtil { diff --git a/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java b/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java index a23a81c412..391f53d027 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java +++ b/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java @@ -1,6 +1,6 @@ package org.session.libsession.utilities.concurrent; -import org.session.libsignal.utilities.concurrent.ListenableFuture.Listener; +import org.session.libsignal.utilities.ListenableFuture.Listener; import java.util.concurrent.ExecutionException; diff --git a/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java b/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java index 3e79329050..935b139481 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java +++ b/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java @@ -5,7 +5,7 @@ import android.app.Activity; import androidx.annotation.MainThread; import androidx.core.os.ConfigurationCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Locale; diff --git a/libsignal/src/main/AndroidManifest.xml b/libsignal/src/main/AndroidManifest.xml index a49ba19ba5..ff0be1b305 100644 --- a/libsignal/src/main/AndroidManifest.xml +++ b/libsignal/src/main/AndroidManifest.xml @@ -1,5 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java index 88236d64fe..816fd8b04b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java @@ -8,26 +8,8 @@ package org.session.libsignal.service.api.messages; import com.google.protobuf.ByteString; -import org.session.libsignal.libsignal.InvalidVersionException; -import org.session.libsignal.utilities.logging.Log; import org.session.libsignal.service.api.push.SignalServiceAddress; import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope; -import org.session.libsignal.utilities.Base64; -import org.session.libsignal.utilities.Hex; - -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.Mac; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; /** * This class represents an encrypted Signal Service envelope. diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java index dda2357cb1..031e7880f1 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.internal.push; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class PushTransportDetails { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt index 90a20d2282..7aa42fd3a6 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt +++ b/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt @@ -1,7 +1,7 @@ package org.session.libsignal.service.loki import okhttp3.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import java.lang.IllegalStateException import java.security.SecureRandom diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt b/libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt index 4957045a61..a8a8fd662f 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.externalstorage +package org.session.libsignal.utilities import android.content.Context import android.net.Uri diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java b/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java index 046afeb34f..89af2cee3c 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java @@ -1,24 +1,14 @@ package org.session.libsignal.utilities; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.ResolvedType; -import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.SerializerProvider; import org.json.JSONException; import org.json.JSONObject; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.InvalidKeyException; -import org.session.libsignal.utilities.logging.Log; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java b/libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java similarity index 85% rename from libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java index d621f9db83..59e04ee99e 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.concurrent; +package org.session.libsignal.utilities; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java b/libsignal/src/main/java/org/session/libsignal/utilities/Log.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Log.java index 0f6b74ffb2..f2f7005988 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Log.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.logging; +package org.session.libsignal.utilities; import androidx.annotation.MainThread; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java b/libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java similarity index 95% rename from libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java rename to libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java index 7f0de9510a..d57ae0b4ec 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.session.libsignal.utilities.externalstorage; +package org.session.libsignal.utilities; public class NoExternalStorageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt index 530d432d57..d6361289c5 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt @@ -3,7 +3,6 @@ package org.session.libsignal.utilities import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred -import org.session.libsignal.utilities.logging.Log import java.util.concurrent.TimeoutException fun Promise.get(defaultValue: V): V { diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java b/libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java rename to libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java index 070abb556e..ca540da41d 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.concurrent; +package org.session.libsignal.utilities; import java.util.LinkedList; import java.util.List; From ce3b32c03e22704333db9103401e719c11a3af7c Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:17:22 +1000 Subject: [PATCH 21/29] Move files --- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../RecoveryPhraseRestoreActivity.kt | 2 +- .../securesms/loki/activities/SeedActivity.kt | 2 +- .../securesms/loki/dialogs/SeedDialog.kt | 2 +- .../messaging/file_server/FileServerAPIV2.kt | 14 ++++++------ .../messaging/open_groups/OpenGroupAPIV2.kt | 22 +++++++++---------- .../messaging/utilities/DotNetAPI.kt | 4 ++-- .../libsession/snode/OnionRequestAPI.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../{utilities => crypto}/DiffieHellman.kt | 2 +- .../{service/loki => crypto}/MnemonicCodec.kt | 2 +- .../{service/loki => crypto}/Random.kt | 0 .../service/loki/SignalMessageInfo.kt | 14 ------------ .../{service/loki => utilities}/HTTP.kt | 4 +--- .../loki => utilities}/HexEncoding.kt | 0 .../PrettifiedDescription.kt | 0 .../{service/loki => utilities}/Reflection.kt | 0 .../{service/loki => utilities}/Retrying.kt | 0 .../{service/loki => utilities}/Trimming.kt | 0 .../{service/loki => utilities}/Validation.kt | 0 20 files changed, 29 insertions(+), 45 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{utilities => crypto}/DiffieHellman.kt (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => crypto}/MnemonicCodec.kt (99%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => crypto}/Random.kt (100%) delete mode 100644 libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/HTTP.kt (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/HexEncoding.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/PrettifiedDescription.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Reflection.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Retrying.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Trimming.kt (100%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Validation.kt (100%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index b9d8a9b0eb..540f2edc9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -27,7 +27,7 @@ import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.KeyHelper -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt index 841b9e789a..d0f1fcb113 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.KeyHelper -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.thoughtcrime.securesms.BaseActionBarActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt index 9ee8025335..10fdc5cbc1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt @@ -16,7 +16,7 @@ import org.session.libsession.utilities.IdentityKeyUtil import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey class SeedActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt index d327efe973..8bd2e5c7da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt @@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.dialog_seed.view.* import network.loki.messenger.R import org.session.libsession.utilities.IdentityKeyUtil import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities -import org.session.libsignal.service.loki.MnemonicCodec +import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt index 619b78aced..bb3301b8cf 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt @@ -8,7 +8,7 @@ import okhttp3.MediaType import okhttp3.RequestBody import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.Log @@ -24,12 +24,12 @@ object FileServerAPIV2 { } data class Request( - val verb: HTTP.Verb, - val endpoint: String, - val queryParameters: Map = mapOf(), - val parameters: Any? = null, - val headers: Map = mapOf(), - /** + val verb: HTTP.Verb, + val endpoint: String, + val queryParameters: Map = mapOf(), + val parameters: Any? = null, + val headers: Map = mapOf(), + /** * Always `true` under normal circumstances. You might want to disable * this when running over Lokinet. */ diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index 2bdbd9daf6..8bd44a9a19 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -15,8 +15,8 @@ import okhttp3.RequestBody import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.AESGCM -import org.session.libsignal.service.loki.HTTP -import org.session.libsignal.service.loki.HTTP.Verb.* +import org.session.libsignal.utilities.HTTP +import org.session.libsignal.utilities.HTTP.Verb.* import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64.* @@ -65,15 +65,15 @@ object OpenGroupAPIV2 { } data class Request( - val verb: HTTP.Verb, - val room: String?, - val server: String, - val endpoint: String, - val queryParameters: Map = mapOf(), - val parameters: Any? = null, - val headers: Map = mapOf(), - val isAuthRequired: Boolean = true, - /** + val verb: HTTP.Verb, + val room: String?, + val server: String, + val endpoint: String, + val queryParameters: Map = mapOf(), + val parameters: Any? = null, + val headers: Map = mapOf(), + val isAuthRequired: Boolean = true, + /** * Always `true` under normal circumstances. You might want to disable * this when running over Lokinet. */ diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 2f5b16048a..90a4704440 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.messaging.file_server.FileServerAPI -import org.session.libsignal.utilities.DiffieHellman +import org.session.libsignal.crypto.DiffieHellman import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException @@ -21,7 +21,7 @@ import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.utilities.* import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index b983815a85..209fa12ac1 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -17,7 +17,7 @@ import org.session.libsession.utilities.AESGCM.EncryptionResult import org.session.libsession.utilities.getBodyForOnionRequest import org.session.libsession.utilities.getHeadersForOnionRequest import org.session.libsignal.service.loki.Broadcaster -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.utilities.* diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index b52cb9cd6b..239e70e537 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.HTTP +import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.Broadcaster import org.session.libsignal.service.loki.utilities.prettifiedDescription diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt index a3b3f53527..8e009334ad 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/DiffieHellman.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities +package org.session.libsignal.crypto import org.whispersystems.curve25519.Curve25519 import org.session.libsignal.service.internal.util.Util diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt b/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt index 122354f33d..73c86f321e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/MnemonicCodec.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/MnemonicCodec.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.crypto import java.util.zip.CRC32 diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Random.kt b/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Random.kt rename to libsignal/src/main/java/org/session/libsignal/crypto/Random.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt deleted file mode 100644 index f5e20f4168..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/SignalMessageInfo.kt +++ /dev/null @@ -1,14 +0,0 @@ -package org.session.libsignal.service.loki - -import org.session.libsignal.service.internal.push.SignalServiceProtos - -data class SignalMessageInfo( - val type: SignalServiceProtos.Envelope.Type, - val timestamp: Long, - val senderPublicKey: String, - val senderDeviceID: Int, - val content: String, - val recipientPublicKey: String, - val ttl: Int?, - val isPing: Boolean -) diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt index 7aa42fd3a6..31038a4574 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HTTP.kt @@ -1,8 +1,6 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.utilities import okhttp3.* -import org.session.libsignal.utilities.Log -import org.session.libsignal.utilities.JsonUtil import java.lang.IllegalStateException import java.security.SecureRandom import java.security.cert.X509Certificate diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/HexEncoding.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/PrettifiedDescription.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/PrettifiedDescription.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Reflection.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Reflection.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Retrying.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Retrying.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Trimming.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Trimming.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Validation.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt similarity index 100% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Validation.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt From 40d2fd25d9540540e51bdf1d6a9f18d1662ed70b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:21:56 +1000 Subject: [PATCH 22/29] Move files --- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/database/Storage.kt | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 2 +- .../jobs/RetrieveProfileAvatarJob.java | 2 +- .../loki/activities/RegisterActivity.kt | 2 +- .../loki/database/LokiAPIDatabase.kt | 6 +- .../loki/protocol/ClosedGroupsMigration.kt | 6 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 6 +- .../mms/AttachmentStreamLocalUriFetcher.java | 2 +- .../libsession/messaging/StorageProtocol.kt | 2 +- .../messaging/jobs/AttachmentDownloadJob.kt | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 6 +- .../control/ClosedGroupControlMessage.kt | 6 +- .../messages/control/ConfigurationMessage.kt | 6 +- .../sending_receiving/MessageDecrypter.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 4 +- .../ReceivedMessageHandler.kt | 6 +- .../messaging/utilities/DotNetAPI.kt | 2 +- .../libsession/utilities/IdentityKeyUtil.java | 8 +- .../libsession/utilities/KeyPairUtilities.kt | 6 +- .../utilities/ProfilePictureUtilities.kt | 2 +- .../{libsignal => crypto}/ecc/Curve.java | 3 +- .../ecc/DjbECPrivateKey.java | 2 +- .../ecc/DjbECPublicKey.java | 3 +- .../{libsignal => crypto}/ecc/ECKeyPair.java | 2 +- .../ecc/ECPrivateKey.java | 2 +- .../ecc/ECPublicKey.java | 2 +- .../{libsignal => crypto}/kdf/HKDF.java | 2 +- .../{libsignal => crypto}/kdf/HKDFv3.java | 2 +- .../libsignal/libsignal/IdentityKey.java | 4 +- .../libsignal/libsignal/IdentityKeyPair.java | 2 +- .../api/SignalServiceMessageReceiver.java | 3 - .../api/crypto/SignalServiceCipher.java | 336 ------------------ .../AttachmentCipherOutputStreamFactory.java | 4 +- .../push/http/DigestingRequestBody.java | 2 +- .../push/http/OutputStreamFactory.java | 2 +- .../ProfileCipherOutputStreamFactory.java | 4 +- .../service/loki/LokiAPIDatabaseProtocol.kt | 3 +- .../AttachmentCipherInputStream.java | 3 +- .../AttachmentCipherOutputStream.java | 2 +- .../ContentLengthInputStream.java | 4 +- .../DigestingOutputStream.java | 2 +- .../PaddingInputStream.java | 3 +- .../PlaintextOutputStreamFactory.kt | 3 +- .../ProfileCipherInputStream.java | 3 +- .../ProfileCipherOutputStream.java | 2 +- .../libsignal/utilities/HexEncoding.kt | 2 +- 48 files changed, 71 insertions(+), 415 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/Curve.java (96%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/DjbECPrivateKey.java (91%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/DjbECPublicKey.java (96%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/ECKeyPair.java (91%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/ECPrivateKey.java (82%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/ecc/ECPublicKey.java (86%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/kdf/HKDF.java (98%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/kdf/HKDFv3.java (83%) delete mode 100644 libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java rename libsignal/src/main/java/org/session/libsignal/{service/api/crypto => streams}/AttachmentCipherInputStream.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api/crypto => streams}/AttachmentCipherOutputStream.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/util => streams}/ContentLengthInputStream.java (90%) rename libsignal/src/main/java/org/session/libsignal/{service/api/crypto => streams}/DigestingOutputStream.java (96%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/crypto => streams}/PaddingInputStream.java (96%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => streams}/PlaintextOutputStreamFactory.kt (83%) rename libsignal/src/main/java/org/session/libsignal/{service/api/crypto => streams}/ProfileCipherInputStream.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api/crypto => streams}/ProfileCipherOutputStream.java (97%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 2d0e2fca33..9fed124912 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.utilities.Util -import org.session.libsignal.libsignal.kdf.HKDFv3 +import org.session.libsignal.crypto.kdf.HKDFv3 import org.session.libsignal.libsignal.util.ByteUtil import java.io.* import java.lang.Exception diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index 9d82e9c7e0..d9e127a92e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -19,7 +19,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.Conversions import org.session.libsession.utilities.Util -import org.session.libsignal.libsignal.kdf.HKDFv3 +import org.session.libsignal.crypto.kdf.HKDFv3 import org.session.libsignal.libsignal.util.ByteUtil import java.io.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 1651405d4c..416347a0b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -29,7 +29,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index e1782e271f..1058acdcfa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; import org.session.libsession.utilities.DownloadUtilities; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; +import org.session.libsignal.streams.AttachmentCipherInputStream; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase; import org.session.libsession.messaging.threads.GroupRecord; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 36baa2860d..4f7407ecbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -13,7 +13,7 @@ import org.session.libsession.utilities.DownloadUtilities; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; -import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; +import org.session.libsignal.streams.ProfileCipherInputStream; import org.session.libsignal.service.api.push.exceptions.PushNetworkException; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index 79f462b9f8..a4807c6f62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -19,7 +19,7 @@ import com.goterl.lazycode.lazysodium.utils.KeyPair import kotlinx.android.synthetic.main.activity_register.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index fac748efc4..6b92f066b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -4,9 +4,9 @@ import android.content.ContentValues import android.content.Context import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.Snode import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol import org.session.libsignal.service.loki.utilities.PublicKeyValidation diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt index 2883c985f2..0f7cf57ddd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt @@ -7,9 +7,9 @@ import org.thoughtcrime.securesms.loki.utilities.getAll import org.thoughtcrime.securesms.loki.utilities.getString import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate import org.session.libsignal.utilities.Hex -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.utilities.PublicKeyValidation import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 745e9067f9..f5a614ded0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -4,9 +4,9 @@ import android.content.Context import android.util.Log import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.* -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 85f826d3b7..db7f5fcddd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -9,7 +9,7 @@ import com.bumptech.glide.load.data.DataFetcher; import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.InvalidMessageException; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; +import org.session.libsignal.streams.AttachmentCipherInputStream; import java.io.File; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt index 816ede3414..5fa1dd3e3f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt @@ -19,7 +19,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.GroupRecord import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceGroup diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index 0a6666230f..362b2e81ed 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.DownloadUtilities -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream +import org.session.libsignal.streams.AttachmentCipherInputStream import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index ae81540052..a89831a140 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -13,14 +13,14 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI -import org.session.libsignal.service.api.crypto.AttachmentCipherOutputStream +import org.session.libsignal.streams.AttachmentCipherOutputStream import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream -import org.session.libsignal.service.internal.crypto.PaddingInputStream +import org.session.libsignal.streams.PaddingInputStream import org.session.libsignal.service.internal.push.PushAttachmentData import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.util.Util -import org.session.libsignal.service.loki.PlaintextOutputStreamFactory +import org.session.libsignal.streams.PlaintextOutputStreamFactory import org.session.libsignal.utilities.Log class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val message: Message, val messageSendJobID: String) : Job { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 38e505c3e8..938c027b13 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -5,9 +5,9 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt index 1a15d34860..0a4dd4c27c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt @@ -6,9 +6,9 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt index a3c81c9390..902ed97dfc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt @@ -5,7 +5,7 @@ import com.goterl.lazycode.lazysodium.LazySodiumAndroid import com.goterl.lazycode.lazysodium.SodiumAndroid import com.goterl.lazycode.lazysodium.interfaces.Box import com.goterl.lazycode.lazysodium.interfaces.Sign -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index e677a2534b..792a15a9ab 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -12,8 +12,8 @@ import org.session.libsession.messaging.sending_receiving.notifications.PushNoti import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.ecc.Curve -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.Curve +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 7ec058a64f..da9be94210 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -20,9 +20,9 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 90a4704440..b5bf24d33c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -11,7 +11,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.crypto.DiffieHellman -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream +import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java index 06de335b4c..ebbeef0a10 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java @@ -22,13 +22,13 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import androidx.annotation.NonNull; -import org.session.libsignal.libsignal.ecc.ECPublicKey; +import org.session.libsignal.crypto.ecc.ECPublicKey; import org.session.libsignal.libsignal.IdentityKey; import org.session.libsignal.libsignal.IdentityKeyPair; import org.session.libsignal.libsignal.InvalidKeyException; -import org.session.libsignal.libsignal.ecc.Curve; -import org.session.libsignal.libsignal.ecc.ECKeyPair; -import org.session.libsignal.libsignal.ecc.ECPrivateKey; +import org.session.libsignal.crypto.ecc.Curve; +import org.session.libsignal.crypto.ecc.ECKeyPair; +import org.session.libsignal.crypto.ecc.ECPrivateKey; import org.session.libsignal.utilities.Base64; diff --git a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt index 92326cfc68..5d52c1175f 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/KeyPairUtilities.kt @@ -7,9 +7,9 @@ import com.goterl.lazycode.lazysodium.utils.Key import com.goterl.lazycode.lazysodium.utils.KeyPair import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Hex -import org.session.libsignal.libsignal.ecc.DjbECPrivateKey -import org.session.libsignal.libsignal.ecc.DjbECPublicKey -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.DjbECPrivateKey +import org.session.libsignal.crypto.ecc.DjbECPublicKey +import org.session.libsignal.crypto.ecc.ECKeyPair object KeyPairUtilities { diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index e95305b122..14e9475cff 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -6,7 +6,7 @@ import nl.komponents.kovenant.deferred import okio.Buffer import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream +import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java index 0cf12b71aa..7b7ad4f3d0 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/Curve.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java @@ -3,12 +3,11 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; import org.whispersystems.curve25519.Curve25519; import org.whispersystems.curve25519.Curve25519KeyPair; import org.session.libsignal.libsignal.InvalidKeyException; - import static org.whispersystems.curve25519.Curve25519.BEST; public class Curve { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java index 377de7625e..5c6d8c4583 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPrivateKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPrivateKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public class DjbECPrivateKey implements ECPrivateKey { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java index b6c2d3e405..b3fcabf255 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/DjbECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java @@ -4,10 +4,9 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; import org.session.libsignal.libsignal.util.ByteUtil; - import java.math.BigInteger; import java.util.Arrays; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java index db9538b99a..3797654a96 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECKeyPair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public class ECKeyPair { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java similarity index 82% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java index b7398ee1be..47b6848edd 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPrivateKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPrivateKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public interface ECPrivateKey { public byte[] serialize(); diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java similarity index 86% rename from libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java index c4cbca4395..4f1f3e18b4 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/ecc/ECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/ECPublicKey.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.ecc; +package org.session.libsignal.crypto.ecc; public interface ECPublicKey extends Comparable { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java rename to libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java index c0b65b38af..3295f06e52 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDF.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDF.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.kdf; +package org.session.libsignal.crypto.kdf; import java.io.ByteArrayOutputStream; import java.security.InvalidKeyException; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java rename to libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java index e275706933..1455276d67 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/kdf/HKDFv3.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/kdf/HKDFv3.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.kdf; +package org.session.libsignal.crypto.kdf; public class HKDFv3 extends HKDF { @Override diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java index 7350ceb329..795f3bdbfe 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java +++ b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java @@ -6,8 +6,8 @@ package org.session.libsignal.libsignal; -import org.session.libsignal.libsignal.ecc.Curve; -import org.session.libsignal.libsignal.ecc.ECPublicKey; +import org.session.libsignal.crypto.ecc.Curve; +import org.session.libsignal.crypto.ecc.ECPublicKey; import org.session.libsignal.utilities.Hex; /** diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java index 84b843548b..65eedc7db1 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java @@ -5,7 +5,7 @@ */ package org.session.libsignal.libsignal; -import org.session.libsignal.libsignal.ecc.ECPrivateKey; +import org.session.libsignal.crypto.ecc.ECPrivateKey; /** * Holder for public and private identity key pair. diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index 250d9730a9..ec8be2c45e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -7,14 +7,11 @@ package org.session.libsignal.service.api; import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; -import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java b/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java deleted file mode 100644 index 7f1cd6051e..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/SignalServiceCipher.java +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.session.libsignal.service.api.crypto; - -import com.google.protobuf.InvalidProtocolBufferException; - -import org.session.libsignal.libsignal.ecc.ECKeyPair; -import org.session.libsignal.metadata.InvalidMetadataMessageException; -import org.session.libsignal.metadata.ProtocolInvalidMessageException; -import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceContent; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage.Preview; -import org.session.libsignal.service.api.messages.SignalServiceEnvelope; -import org.session.libsignal.service.api.messages.SignalServiceGroup; -import org.session.libsignal.service.api.messages.SignalServiceReceiptMessage; -import org.session.libsignal.service.api.messages.SignalServiceTypingMessage; -import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.PushTransportDetails; -import org.session.libsignal.service.internal.push.SignalServiceProtos; -import org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.Content; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage; -import org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage; -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; - -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; - -import static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.DELIVER; - -/** - * This is used to decrypt received {@link SignalServiceEnvelope}s. - * - * @author Moxie Marlinspike - */ -public class SignalServiceCipher { - - @SuppressWarnings("unused") - private static final String TAG = SignalServiceCipher.class.getSimpleName(); - - private final LokiAPIDatabaseProtocol apiDB; - - public SignalServiceCipher(LokiAPIDatabaseProtocol apiDB) - { - this.apiDB = apiDB; - } - - /** - * Decrypt a received {@link SignalServiceEnvelope} - * - * @param envelope The received SignalServiceEnvelope - * - * @return a decrypted SignalServiceContent - */ - public SignalServiceContent decrypt(SignalServiceEnvelope envelope) throws InvalidMetadataMessageException,ProtocolInvalidMessageException - { - try { - Plaintext plaintext = decrypt(envelope, envelope.getContent()); - Content message = Content.parseFrom(plaintext.getData()); - - if (message.hasConfigurationMessage()) { - SignalServiceCipher.Metadata metadata = plaintext.getMetadata(); - SignalServiceContent content = new SignalServiceContent(message, metadata.getSender(), metadata.getSenderDevice(), metadata.getTimestamp()); - - if (message.hasDataMessage()) { - setProfile(message.getDataMessage(), content); - SignalServiceDataMessage signalServiceDataMessage = createSignalServiceMessage(metadata, message.getDataMessage()); - content.setDataMessage(signalServiceDataMessage); - } - - return content; - } else if (message.hasDataMessage()) { - DataMessage dataMessage = message.getDataMessage(); - - SignalServiceDataMessage signalServiceDataMessage = createSignalServiceMessage(plaintext.getMetadata(), dataMessage); - SignalServiceContent content = new SignalServiceContent(signalServiceDataMessage, - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp(), - plaintext.getMetadata().isNeedsReceipt()); - - setProfile(dataMessage, content); - - return content; - } else if (message.hasReceiptMessage()) { - return new SignalServiceContent(createReceiptMessage(plaintext.getMetadata(), message.getReceiptMessage()), - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp()); - } else if (message.hasTypingMessage()) { - return new SignalServiceContent(createTypingMessage(plaintext.getMetadata(), message.getTypingMessage()), - plaintext.getMetadata().getSender(), - plaintext.getMetadata().getSenderDevice(), - plaintext.getMetadata().getTimestamp()); - } - - return null; - } catch (InvalidProtocolBufferException e) { - throw new InvalidMetadataMessageException(e); - } - } - - private void setProfile(DataMessage message, SignalServiceContent content) { - if (!message.hasProfile()) { return; } - SignalServiceProtos.DataMessage.LokiProfile profile = message.getProfile(); - if (profile.hasDisplayName()) { content.setSenderDisplayName(profile.getDisplayName()); } - if (profile.hasProfilePicture()) { content.setSenderProfilePictureURL(profile.getProfilePicture()); } - } - - protected Plaintext decrypt(SignalServiceEnvelope envelope, byte[] ciphertext) throws InvalidMetadataMessageException - { - throw new IllegalStateException("This shouldn't be used anymore"); - } - - private SignalServiceDataMessage createSignalServiceMessage(Metadata metadata, DataMessage content) throws ProtocolInvalidMessageException { - SignalServiceGroup groupInfo = createGroupInfo(content); - List attachments = new LinkedList(); - boolean expirationUpdate = ((content.getFlags() & DataMessage.Flags.EXPIRATION_TIMER_UPDATE_VALUE) != 0); - SignalServiceDataMessage.Quote quote = createQuote(content); - List previews = createPreviews(content); - ClosedGroupControlMessage closedGroupControlMessage = content.getClosedGroupControlMessage(); - String syncTarget = content.getSyncTarget(); - - for (AttachmentPointer pointer : content.getAttachmentsList()) { - attachments.add(createAttachmentPointer(pointer)); - } - - if (content.hasTimestamp() && content.getTimestamp() != metadata.getTimestamp()) { - throw new ProtocolInvalidMessageException(new InvalidMessageException("Timestamps don't match: " + content.getTimestamp() + " vs " + metadata.getTimestamp()), - metadata.getSender(), - metadata.getSenderDevice()); - } - - return new SignalServiceDataMessage(metadata.getTimestamp(), - groupInfo, - attachments, - content.getBody(), - content.getExpireTimer(), - expirationUpdate, - content.hasProfileKey() ? content.getProfileKey().toByteArray() : null, - quote, - new ArrayList<>(), - previews, - closedGroupControlMessage, - syncTarget); - } - - private SignalServiceReceiptMessage createReceiptMessage(Metadata metadata, ReceiptMessage content) { - SignalServiceReceiptMessage.Type type; - - if (content.getType() == ReceiptMessage.Type.DELIVERY) type = SignalServiceReceiptMessage.Type.DELIVERY; - else if (content.getType() == ReceiptMessage.Type.READ) type = SignalServiceReceiptMessage.Type.READ; - else type = SignalServiceReceiptMessage.Type.UNKNOWN; - - return new SignalServiceReceiptMessage(type, content.getTimestampList(), metadata.getTimestamp()); - } - - private SignalServiceTypingMessage createTypingMessage(Metadata metadata, TypingMessage content) throws ProtocolInvalidMessageException { - SignalServiceTypingMessage.Action action; - - if (content.getAction() == TypingMessage.Action.STARTED) action = SignalServiceTypingMessage.Action.STARTED; - else if (content.getAction() == TypingMessage.Action.STOPPED) action = SignalServiceTypingMessage.Action.STOPPED; - else action = SignalServiceTypingMessage.Action.UNKNOWN; - - if (content.hasTimestamp() && content.getTimestamp() != metadata.getTimestamp()) { - throw new ProtocolInvalidMessageException(new InvalidMessageException("Timestamps don't match: " + content.getTimestamp() + " vs " + metadata.getTimestamp()), - metadata.getSender(), - metadata.getSenderDevice()); - } - - return new SignalServiceTypingMessage(action, content.getTimestamp()); - } - - private SignalServiceDataMessage.Quote createQuote(DataMessage content) { - if (!content.hasQuote()) return null; - - List attachments = new LinkedList(); - - for (DataMessage.Quote.QuotedAttachment attachment : content.getQuote().getAttachmentsList()) { - attachments.add(new SignalServiceDataMessage.Quote.QuotedAttachment(attachment.getContentType(), - attachment.getFileName(), - attachment.hasThumbnail() ? createAttachmentPointer(attachment.getThumbnail()) : null)); - } - - return new SignalServiceDataMessage.Quote(content.getQuote().getId(), - new SignalServiceAddress(content.getQuote().getAuthor()), - content.getQuote().getText(), - attachments); - } - - private List createPreviews(DataMessage content) { - if (content.getPreviewCount() <= 0) return null; - - List results = new LinkedList(); - - for (DataMessage.Preview preview : content.getPreviewList()) { - SignalServiceAttachment attachment = null; - - if (preview.hasImage()) { - attachment = createAttachmentPointer(preview.getImage()); - } - - results.add(new Preview(preview.getUrl(), - preview.getTitle(), - Optional.fromNullable(attachment))); - } - - return results; - } - - private SignalServiceAttachmentPointer createAttachmentPointer(AttachmentPointer pointer) { - return new SignalServiceAttachmentPointer(pointer.getId(), - pointer.getContentType(), - pointer.getKey().toByteArray(), - pointer.hasSize() ? Optional.of(pointer.getSize()) : Optional.absent(), - pointer.hasThumbnail() ? Optional.of(pointer.getThumbnail().toByteArray()): Optional.absent(), - pointer.getWidth(), pointer.getHeight(), - pointer.hasDigest() ? Optional.of(pointer.getDigest().toByteArray()) : Optional.absent(), - pointer.hasFileName() ? Optional.of(pointer.getFileName()) : Optional.absent(), - (pointer.getFlags() & AttachmentPointer.Flags.VOICE_MESSAGE_VALUE) != 0, - pointer.hasCaption() ? Optional.of(pointer.getCaption()) : Optional.absent(), - pointer.getUrl()); - - } - - private SignalServiceGroup createGroupInfo(DataMessage content) { - if (!content.hasGroup()) return null; - - SignalServiceGroup.Type type; - - switch (content.getGroup().getType()) { - case DELIVER: type = SignalServiceGroup.Type.DELIVER; break; - case UPDATE: type = SignalServiceGroup.Type.UPDATE; break; - case QUIT: type = SignalServiceGroup.Type.QUIT; break; - case REQUEST_INFO: type = SignalServiceGroup.Type.REQUEST_INFO; break; - default: type = SignalServiceGroup.Type.UNKNOWN; break; - } - - if (content.getGroup().getType() != DELIVER) { - String name = null; - List members = null; - SignalServiceAttachmentPointer avatar = null; - List admins = null; - - if (content.getGroup().hasName()) { - name = content.getGroup().getName(); - } - - if (content.getGroup().getMembersCount() > 0) { - members = content.getGroup().getMembersList(); - } - - if (content.getGroup().hasAvatar()) { - AttachmentPointer pointer = content.getGroup().getAvatar(); - - avatar = new SignalServiceAttachmentPointer(pointer.getId(), - pointer.getContentType(), - pointer.getKey().toByteArray(), - Optional.of(pointer.getSize()), - Optional.absent(), 0, 0, - Optional.fromNullable(pointer.hasDigest() ? pointer.getDigest().toByteArray() : null), - Optional.absent(), - false, - Optional.absent(), - pointer.getUrl()); - } - - if (content.getGroup().getAdminsCount() > 0) { - admins = content.getGroup().getAdminsList(); - } - - return new SignalServiceGroup(type, content.getGroup().getId().toByteArray(), SignalServiceGroup.GroupType.SIGNAL, name, members, avatar, admins); - } - - return new SignalServiceGroup(content.getGroup().getId().toByteArray(), SignalServiceGroup.GroupType.SIGNAL); - } - - protected static class Metadata { - private final String sender; - private final int senderDevice; - private final long timestamp; - private final boolean needsReceipt; - - public Metadata(String sender, int senderDevice, long timestamp, boolean needsReceipt) { - this.sender = sender; - this.senderDevice = senderDevice; - this.timestamp = timestamp; - this.needsReceipt = needsReceipt; - } - - public String getSender() { - return sender; - } - - public int getSenderDevice() { - return senderDevice; - } - - public long getTimestamp() { - return timestamp; - } - - public boolean isNeedsReceipt() { - return needsReceipt; - } - } - - protected static class Plaintext { - private final Metadata metadata; - private final byte[] data; - - public Plaintext(Metadata metadata, byte[] data) { - this.metadata = metadata; - this.data = data; - } - - public Metadata getMetadata() { - return metadata; - } - - public byte[] getData() { - return data; - } - } -} diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java index 8a6599ab05..f5a0657d31 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.AttachmentCipherOutputStream; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.AttachmentCipherOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java index 904fe31d2f..d4806c5103 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java index 9e68793fcb..592c037d7b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java index 962146dcf1..14a76c3991 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java @@ -1,8 +1,8 @@ package org.session.libsignal.service.internal.push.http; -import org.session.libsignal.service.api.crypto.DigestingOutputStream; -import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream; +import org.session.libsignal.streams.DigestingOutputStream; +import org.session.libsignal.streams.ProfileCipherOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt index 2b4fc4f32a..c1886ed0cc 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt @@ -1,7 +1,6 @@ package org.session.libsignal.service.loki -import org.session.libsignal.libsignal.ecc.ECKeyPair -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.crypto.ecc.ECKeyPair import java.util.* interface LokiAPIDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 15c1bd59b6..4ad149698f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -4,11 +4,10 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import org.session.libsignal.libsignal.InvalidMacException; import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.service.internal.util.ContentLengthInputStream; import org.session.libsignal.service.internal.util.Util; import java.io.File; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java index e214f99e1e..578dc82c69 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/AttachmentCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java similarity index 90% rename from libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java index 71322466bd..8c7217cbb7 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/util/ContentLengthInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java @@ -1,6 +1,8 @@ -package org.session.libsignal.service.internal.util; +package org.session.libsignal.streams; +import org.session.libsignal.service.internal.util.Util; + import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java index 77e45082d6..331fa32c87 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/DigestingOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import java.io.FilterOutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java index 4040a00785..e57aca6fc0 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/crypto/PaddingInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.internal.crypto; - +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt rename to libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt index 412f66458f..2c1e118dac 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/PlaintextOutputStreamFactory.kt +++ b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt @@ -1,6 +1,5 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.streams -import org.session.libsignal.service.api.crypto.DigestingOutputStream import org.session.libsignal.service.internal.push.http.OutputStreamFactory import java.io.OutputStream diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java index 42ed1ac9f7..c982a503d7 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.crypto; - +package org.session.libsignal.streams; import org.session.libsignal.service.internal.util.Util; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java index e663ba0e82..9d4e13a0c2 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/crypto/ProfileCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStream.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.crypto; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt index 40b094d760..d6ec9800be 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt @@ -1,7 +1,7 @@ package org.session.libsignal.service.loki.utilities import org.session.libsignal.libsignal.IdentityKeyPair -import org.session.libsignal.libsignal.ecc.ECKeyPair +import org.session.libsignal.crypto.ecc.ECKeyPair fun ByteArray.toHexString(): String { return joinToString("") { String.format("%02x", it) } From c9ebcc580f3b5bfe96050bf999be44a2ce063a63 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:26:08 +1000 Subject: [PATCH 23/29] Move files --- .../securesms/BindableConversationItem.java | 2 +- .../securesms/MessageDetailsActivity.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 2 +- .../securesms/audio/AudioSlidePlayer.java | 2 +- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/components/DocumentView.java | 3 +-- .../securesms/components/InputPanel.java | 2 +- .../securesms/components/ThumbnailView.java | 2 +- .../components/camera/CameraView.java | 2 +- .../components/emoji/EmojiPages.java | 2 +- .../components/emoji/EmojiProvider.java | 2 +- .../components/emoji/EmojiTextView.java | 2 +- .../contactshare/ContactModelMapper.java | 2 +- .../conversation/ConversationActivity.java | 4 ++-- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../conversation/ConversationItem.java | 2 +- .../conversation/ConversationUpdateItem.java | 2 +- .../crypto/IdentityKeyParcelable.java | 4 ++-- .../securesms/database/GroupDatabase.java | 2 +- .../securesms/database/MessagingDatabase.java | 2 +- .../securesms/database/MmsDatabase.java | 2 +- .../securesms/database/PushDatabase.java | 2 +- .../securesms/database/RecipientDatabase.java | 2 +- .../securesms/database/SmsDatabase.java | 2 +- .../securesms/database/Storage.kt | 4 ++-- .../securesms/database/ThreadDatabase.java | 4 ++-- .../database/loaders/ConversationLoader.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 4 ++-- .../linkpreview/LinkPreviewRepository.java | 2 +- .../linkpreview/LinkPreviewUtil.java | 2 +- .../linkpreview/LinkPreviewViewModel.java | 2 +- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../RecoveryPhraseRestoreActivity.kt | 2 +- .../loki/activities/RegisterActivity.kt | 2 +- .../longmessage/LongMessageRepository.java | 2 +- .../longmessage/LongMessageViewModel.java | 2 +- .../mediapreview/MediaPreviewViewModel.java | 2 +- .../securesms/mediasend/Media.java | 2 +- .../mediasend/MediaPickerFolderFragment.java | 4 ++-- .../securesms/mediasend/MediaRepository.java | 2 +- .../mediasend/MediaSendActivity.java | 2 +- .../mediasend/MediaSendFragment.java | 2 +- .../mediasend/MediaSendViewModel.java | 2 +- .../securesms/mms/AttachmentManager.java | 2 +- .../mms/AttachmentStreamLocalUriFetcher.java | 4 ++-- .../mms/AttachmentStreamUriLoader.java | 2 +- .../org/thoughtcrime/securesms/mms/Slide.java | 2 +- .../thoughtcrime/securesms/mms/SlideDeck.java | 2 +- .../securesms/net/CallRequestController.java | 2 +- .../securesms/net/ChunkedDataFetcher.java | 4 ++-- .../service/ExpiringMessageManager.java | 2 +- .../service/GenericForegroundService.java | 2 +- .../thoughtcrime/securesms/util/BackupUtil.kt | 2 +- .../securesms/util/SearchUtil.java | 2 +- .../service/VerificationCodeParserTest.java | 2 +- .../securesms/util/SearchUtilTest.java | 2 +- .../documents/IdentityKeyMismatch.java | 4 ++-- .../avatars/GroupRecordContactPhoto.java | 2 +- .../messages/signal/IncomingMediaMessage.java | 2 +- .../messages/signal/IncomingTextMessage.java | 2 +- .../messaging/messages/visible/Attachment.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../ReceivedMessageHandler.kt | 2 +- .../attachments/PointerAttachment.java | 2 +- .../attachments/SessionServiceAttachment.kt | 2 +- .../SessionServiceAttachmentPointer.kt | 2 +- .../SessionServiceAttachmentStream.kt | 2 +- .../link_preview/LinkPreview.java | 2 +- .../libsession/messaging/threads/Address.kt | 2 +- .../threads/recipients/Recipient.java | 2 +- .../threads/recipients/RecipientProvider.java | 2 +- .../session/libsession/utilities/AESGCM.kt | 2 +- .../libsession/utilities/IdentityKeyUtil.java | 6 ++--- .../{libsignal => crypto}/IdentityKey.java | 4 ++-- .../IdentityKeyPair.java | 2 +- .../session/libsignal/crypto/ecc/Curve.java | 2 +- .../libsignal/crypto/ecc/DjbECPublicKey.java | 2 +- .../InvalidKeyException.java | 2 +- .../InvalidMacException.java | 2 +- .../InvalidMessageException.java | 2 +- .../InvalidMetadataMessageException.java | 2 +- .../InvalidVersionException.java | 2 +- .../ProtocolException.java | 2 +- .../ProtocolInvalidMessageException.java | 4 +--- .../libsignal/state/IdentityKeyStore.java | 23 ------------------- .../api/SignalServiceMessageReceiver.java | 2 +- .../api/messages/SignalServiceAttachment.java | 4 +--- .../SignalServiceAttachmentPointer.java | 2 +- .../SignalServiceAttachmentStream.java | 2 +- .../api/messages/SignalServiceContent.java | 2 +- .../messages/SignalServiceDataMessage.java | 2 +- .../api/messages/SignalServiceGroup.java | 3 +-- .../api/messages/shared/SharedContact.java | 2 +- .../api/push/SignalServiceAddress.java | 2 +- .../streams/AttachmentCipherInputStream.java | 4 ++-- .../util => utilities}/ByteUtil.java | 2 +- .../libsignal/utilities/HexEncoding.kt | 2 +- .../util => utilities}/KeyHelper.java | 2 +- .../{libsignal/util => utilities}/Pair.java | 2 +- .../util => utilities}/guava/Absent.java | 5 ++-- .../util => utilities}/guava/Function.java | 4 +--- .../util => utilities}/guava/Optional.java | 5 ++-- .../guava/Preconditions.java | 5 +--- .../util => utilities}/guava/Present.java | 4 ++-- .../util => utilities}/guava/Supplier.java | 3 +-- 107 files changed, 122 insertions(+), 159 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/IdentityKey.java (92%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => crypto}/IdentityKeyPair.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidKeyException.java (92%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidMacException.java (89%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidMessageException.java (92%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/InvalidMetadataMessageException.java (83%) rename libsignal/src/main/java/org/session/libsignal/{libsignal => exceptions}/InvalidVersionException.java (86%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/ProtocolException.java (90%) rename libsignal/src/main/java/org/session/libsignal/{metadata => exceptions}/ProtocolInvalidMessageException.java (67%) delete mode 100644 libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/ByteUtil.java (99%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/KeyHelper.java (96%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/Pair.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Absent.java (93%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Function.java (97%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Optional.java (98%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Preconditions.java (99%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Present.java (94%) rename libsignal/src/main/java/org/session/libsignal/{libsignal/util => utilities}/guava/Supplier.java (95%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java index 5772505950..dcd88d23fe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java @@ -7,7 +7,7 @@ import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.threads.Address; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index 707a522007..abed19ac22 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -65,7 +65,7 @@ import org.session.libsession.messaging.threads.recipients.RecipientModifiedList import org.thoughtcrime.securesms.util.DateUtils; import org.session.libsession.utilities.ExpirationUtil; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.lang.ref.WeakReference; import java.sql.Date; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 43bf135274..7889f578bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.* import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.Util -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index a33b8748a8..a7622306ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -40,7 +40,7 @@ import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.IOException; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 9fed124912..cd3d0641a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.utilities.Util import org.session.libsignal.crypto.kdf.HKDFv3 -import org.session.libsignal.libsignal.util.ByteUtil +import org.session.libsignal.utilities.ByteUtil import java.io.* import java.lang.Exception import java.security.InvalidAlgorithmParameterException diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index d9e127a92e..b106ffd06c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -20,7 +20,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.Conversions import org.session.libsession.utilities.Util import org.session.libsignal.crypto.kdf.HKDFv3 -import org.session.libsignal.libsignal.util.ByteUtil +import org.session.libsignal.utilities.ByteUtil import java.io.* import java.security.InvalidAlgorithmParameterException diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java index 1301fa7286..d1d70fdac0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java @@ -22,12 +22,11 @@ import org.greenrobot.eventbus.ThreadMode; import network.loki.messenger.R; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; -import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.events.PartProgressEvent; import org.thoughtcrime.securesms.mms.DocumentSlide; import org.thoughtcrime.securesms.mms.SlideClickListener; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; public class DocumentView extends FrameLayout { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 05e91b9e17..ec1a38c9c2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java @@ -39,7 +39,7 @@ import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.AssertedSuccessListener; import org.session.libsignal.utilities.ListenableFuture; import org.session.libsignal.utilities.SettableFuture; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 8546d95601..106fa45096 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideClickListener; import org.thoughtcrime.securesms.mms.SlidesClickedListener; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java index f072960c65..11f6c4104b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -38,7 +38,7 @@ import android.view.ViewGroup; import network.loki.messenger.R; import org.thoughtcrime.securesms.util.BitmapUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java index 4f733856e2..436880edef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.emoji; import network.loki.messenger.R; -import org.session.libsignal.libsignal.util.Pair; +import org.session.libsignal.utilities.Pair; import java.util.Arrays; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 76dfe1bf13..47f73d45a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -26,7 +26,7 @@ import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.FutureTaskListener; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.Pair; +import org.session.libsignal.utilities.Pair; import java.util.List; import java.util.concurrent.ExecutionException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index 2bddf9ca8f..28c8deced0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; public class EmojiTextView extends AppCompatTextView { diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java index c724d443bb..7ed743f801 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.shared.SharedContact; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index f6a32654ff..1fbdc0f593 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -112,8 +112,8 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.AssertedSuccessListener; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.exceptions.InvalidMessageException; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.loki.Mention; import org.session.libsignal.service.loki.utilities.HexEncodingKt; import org.session.libsignal.service.loki.utilities.PublicKeyValidation; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index b748a0945f..5a2e459dda 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -47,7 +47,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.LRUCache; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsession.utilities.Conversions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index 91b45536a5..ce0b17dade 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -77,7 +77,7 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.SimpleTask; import org.session.libsession.utilities.task.ProgressDialogAsyncTask; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.MessageDetailsActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index b8acb80571..70c9caae8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -70,7 +70,7 @@ import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.BindableConversationItem; import org.thoughtcrime.securesms.MediaPreviewActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 05fb371bf5..194b9779c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.DateUtils; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java index d8ddc61cfb..2bcfd310d8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyParcelable.java @@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto; import android.os.Parcel; import android.os.Parcelable; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.crypto.IdentityKey; +import org.session.libsignal.exceptions.InvalidKeyException; public class IdentityKeyParcelable implements Parcelable { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index 7f3d0cd97f..aa5aad182a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -23,7 +23,7 @@ import org.session.libsession.messaging.threads.GroupRecord; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java index 026d6b48a6..6509c1a9f6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java @@ -12,7 +12,7 @@ import org.session.libsession.database.documents.IdentityKeyMismatch; import org.session.libsession.database.documents.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Log; -import org.session.libsignal.libsignal.IdentityKey; +import org.session.libsignal.crypto.IdentityKey; import org.session.libsession.messaging.threads.Address; import org.session.libsignal.utilities.JsonUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 3d6510dcaa..4493f778e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -69,7 +69,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.Log; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.Closeable; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 6d63e2797a..e9d417de5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -10,7 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Base64; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceEnvelope; import org.session.libsignal.service.internal.util.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 316822b406..4363250ec1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -19,7 +19,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient.*; import org.session.libsignal.utilities.Base64; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.Log; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 15dc6003cf..43f3740346 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -45,7 +45,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsignal.utilities.JsonUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.IOException; import java.security.SecureRandom; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 416347a0b3..caa0be3987 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -30,8 +30,8 @@ import org.session.libsession.utilities.IdentityKeyUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.libsignal.util.KeyHelper -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.KeyHelper +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceGroup import org.thoughtcrime.securesms.ApplicationContext diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index f70ebabd11..b5db0dbec8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -39,8 +39,8 @@ import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSe import org.session.libsession.utilities.DelimiterUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.Pair; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.Pair; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java index 591f104fed..b5d95ec50a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java @@ -5,7 +5,7 @@ import android.database.Cursor; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.util.AbstractCursorLoader; -import org.session.libsignal.libsignal.util.Pair; +import org.session.libsignal.utilities.Pair; public class ConversationLoader extends AbstractCursorLoader { private final long threadId; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 1058acdcfa..1f87d355cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; import org.session.libsignal.utilities.Hex; -import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.exceptions.InvalidMessageException; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index c2a9def90c..65f22aa23c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.net.CompositeRequestController; import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor; import org.thoughtcrime.securesms.net.RequestController; import org.thoughtcrime.securesms.providers.BlobProvider; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil.OpenGraph; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java index 7bf922ed3a..807c4548a7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java @@ -13,7 +13,7 @@ import android.text.util.Linkify; import com.annimon.stream.Stream; import org.thoughtcrime.securesms.util.DateUtils; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java index 6947801ec5..dbf8c4bf66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java @@ -11,7 +11,7 @@ import android.text.TextUtils; import org.thoughtcrime.securesms.net.RequestController; import org.session.libsession.utilities.Debouncer; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index 540f2edc9a..ecb5ae743a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.filter import kotlinx.coroutines.launch import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.util.KeyHelper +import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt index d0f1fcb113..6d526395df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt @@ -14,7 +14,7 @@ import android.widget.Toast import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.util.KeyHelper +import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index a4807c6f62..d7d071da76 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.activity_register.* import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.libsignal.util.KeyHelper +import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity import org.session.libsession.utilities.KeyPairUtilities diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index 1cc6e0bbd2..43896d904d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.TextSlide; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java index 34efe23fd5..27495a492a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java @@ -12,7 +12,7 @@ import android.os.Handler; import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; class LongMessageViewModel extends ViewModel { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java index 0babefc0e5..259579a59c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java @@ -10,7 +10,7 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.mediasend.Media; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java index 2339d93551..4ae5194f85 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Media.java @@ -5,7 +5,7 @@ import android.os.Parcel; import android.os.Parcelable; import androidx.annotation.NonNull; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; /** * Represents a piece of media that the user has on their device. diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java index f670f9aabd..ff1248a679 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend; import androidx.appcompat.app.ActionBar; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; + import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; @@ -21,7 +21,7 @@ import android.view.WindowManager; import org.thoughtcrime.securesms.mms.GlideApp; import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import network.loki.messenger.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java index 7f515a4ad7..55c84d080c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaRepository.java @@ -19,7 +19,7 @@ import com.annimon.stream.Stream; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 191eca74ea..73fe916812 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -21,7 +21,7 @@ import androidx.fragment.app.FragmentManager; import androidx.lifecycle.ViewModelProvider; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.permissions.Permissions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 34b4c6c0e0..91820bf40a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; import org.thoughtcrime.securesms.util.PushCharacterCalculator; import org.thoughtcrime.securesms.util.Stopwatch; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 89b0f4aa9e..5336503589 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.util.MediaUtil; import org.thoughtcrime.securesms.util.SingleLiveEvent; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.util.Collections; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index efad3ef832..f172f23155 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -51,7 +51,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider; import org.session.libsignal.utilities.ExternalStorageUtil; import org.thoughtcrime.securesms.util.FileProviderUtil; import org.thoughtcrime.securesms.util.MediaUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.threads.recipients.Recipient; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index db7f5fcddd..223166d65c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -7,8 +7,8 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; import org.session.libsignal.utilities.Log; -import org.session.libsignal.libsignal.InvalidMessageException; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.exceptions.InvalidMessageException; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.streams.AttachmentCipherInputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java index 56a733ba74..9549ad242a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java @@ -10,7 +10,7 @@ import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory; import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.File; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java index 2eecd9a0de..f322d17091 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/Slide.java @@ -25,7 +25,7 @@ import androidx.annotation.Nullable; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; import org.thoughtcrime.securesms.util.MediaUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java index d58e2bc215..02ccf85518 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/SlideDeck.java @@ -24,7 +24,7 @@ import com.annimon.stream.Stream; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.thoughtcrime.securesms.util.MediaUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java index ac980b1382..1793cf2a1e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/CallRequestController.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; import org.session.libsession.utilities.Util; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index 5319cc6bfc..af37b86394 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -9,8 +9,8 @@ import com.bumptech.glide.util.ContentLengthInputStream; import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; -import org.session.libsignal.libsignal.util.Pair; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.Pair; +import org.session.libsignal.utilities.guava.Optional; import java.io.FilterInputStream; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index bf2cf9d77f..4fed24c7af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -11,7 +11,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; import org.session.libsignal.utilities.Log; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java index 02db92fc90..58ed5d7d75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -15,7 +15,7 @@ import androidx.core.content.ContextCompat; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; -import org.session.libsignal.libsignal.util.guava.Preconditions; +import org.session.libsignal.utilities.guava.Preconditions; import network.loki.messenger.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt index 6b3d1fabce..b597835e05 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt @@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment import network.loki.messenger.R import org.greenrobot.eventbus.EventBus import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.libsignal.util.ByteUtil +import org.session.libsignal.utilities.ByteUtil import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.backup.BackupEvent import org.thoughtcrime.securesms.backup.BackupPassphrase diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java index cee7f6afd5..8935780b1a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SearchUtil.java @@ -9,7 +9,7 @@ import android.text.style.CharacterStyle; import com.annimon.stream.Stream; -import org.session.libsignal.libsignal.util.Pair; +import org.session.libsignal.utilities.Pair; import java.util.Collections; import java.util.LinkedList; diff --git a/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java b/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java index ac198d549a..2696e8c712 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/service/VerificationCodeParserTest.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service; import org.junit.Before; import org.junit.Test; import org.thoughtcrime.securesms.BaseUnitTest; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.util.HashMap; import java.util.Map; diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java index 4298567e42..4d0833c3fa 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/util/SearchUtilTest.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util; import org.junit.Test; -import org.session.libsignal.libsignal.util.Pair; +import org.session.libsignal.utilities.Pair; import java.util.Arrays; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java index 1f1517e841..01ee2e3069 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java +++ b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java @@ -15,8 +15,8 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.session.libsession.messaging.threads.Address; import org.session.libsignal.utilities.Base64; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.crypto.IdentityKey; +import org.session.libsignal.exceptions.InvalidKeyException; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java b/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java index 7967368e1f..dde2a633fc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java @@ -11,7 +11,7 @@ import org.session.libsession.messaging.StorageProtocol; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.GroupRecord; import org.session.libsession.utilities.Conversions; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java index ed4b8b6df8..42bb18ff93 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java @@ -9,7 +9,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.utilities.GroupUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import org.session.libsignal.service.api.messages.SignalServiceGroup; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 690143a188..0e958d57ea 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -10,7 +10,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; public class IncomingTextMessage implements Parcelable { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index 1630502671..ecfc3feb52 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -5,7 +5,7 @@ import android.webkit.MimeTypeMap import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.internal.push.SignalServiceProtos import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 792a15a9ab..7a07e2aef1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -14,7 +14,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index da9be94210..956f3919ab 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -23,7 +23,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index e1826d3ecc..2f038f913f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -5,7 +5,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt index e7686da4c2..c96947cab0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import com.google.protobuf.ByteString -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachment import java.io.InputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt index ece1b30c3d..170a3b8ead 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt @@ -5,7 +5,7 @@ */ package org.session.libsession.messaging.sending_receiving.attachments -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional /** * Represents a received SignalServiceAttachment "handle." This diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 43a851a787..634557eddd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -7,7 +7,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import android.util.Size import com.google.protobuf.ByteString -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment import java.io.InputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java index 4a644b2e9b..8aa8102a60 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/link_preview/LinkPreview.java @@ -10,7 +10,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsignal.utilities.JsonUtil; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.IOException; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt index abf14afcbc..33c83b036d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt @@ -7,7 +7,7 @@ import android.util.Pair import androidx.annotation.VisibleForTesting import org.session.libsession.utilities.DelimiterUtil import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.libsignal.util.guava.Optional +import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.internal.util.Util import java.util.* import java.util.concurrent.atomic.AtomicReference diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java index 1d18543c86..6ccb2ded7b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java @@ -37,7 +37,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsignal.utilities.Log; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.GroupRecordContactPhoto; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java index 2e634aa957..d38a70f965 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java @@ -24,7 +24,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.MessagingModuleConfiguration; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.GroupRecord; diff --git a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt index 102ef8dc1d..4de7266a41 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt @@ -1,7 +1,7 @@ package org.session.libsession.utilities import androidx.annotation.WorkerThread -import org.session.libsignal.libsignal.util.ByteUtil +import org.session.libsignal.utilities.ByteUtil import org.session.libsignal.service.internal.util.Util import org.session.libsignal.utilities.Hex import org.whispersystems.curve25519.Curve25519 diff --git a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java index ebbeef0a10..d42f5c2ac5 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyUtil.java @@ -23,9 +23,9 @@ import android.content.SharedPreferences.Editor; import androidx.annotation.NonNull; import org.session.libsignal.crypto.ecc.ECPublicKey; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.IdentityKeyPair; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.crypto.IdentityKey; +import org.session.libsignal.crypto.IdentityKeyPair; +import org.session.libsignal.exceptions.InvalidKeyException; import org.session.libsignal.crypto.ecc.Curve; import org.session.libsignal.crypto.ecc.ECKeyPair; import org.session.libsignal.crypto.ecc.ECPrivateKey; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java rename to libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java index 795f3bdbfe..ee9bfe7a6e 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKey.java @@ -3,11 +3,11 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; - +package org.session.libsignal.crypto; import org.session.libsignal.crypto.ecc.Curve; import org.session.libsignal.crypto.ecc.ECPublicKey; +import org.session.libsignal.exceptions.InvalidKeyException; import org.session.libsignal.utilities.Hex; /** diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java rename to libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java index 65eedc7db1..daceacee76 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/IdentityKeyPair.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/IdentityKeyPair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.crypto; import org.session.libsignal.crypto.ecc.ECPrivateKey; diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java index 7b7ad4f3d0..da03b2a41a 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/Curve.java @@ -7,7 +7,7 @@ package org.session.libsignal.crypto.ecc; import org.whispersystems.curve25519.Curve25519; import org.whispersystems.curve25519.Curve25519KeyPair; -import org.session.libsignal.libsignal.InvalidKeyException; +import org.session.libsignal.exceptions.InvalidKeyException; import static org.whispersystems.curve25519.Curve25519.BEST; public class Curve { diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java index b3fcabf255..8cbf988f73 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/ecc/DjbECPublicKey.java @@ -6,7 +6,7 @@ package org.session.libsignal.crypto.ecc; -import org.session.libsignal.libsignal.util.ByteUtil; +import org.session.libsignal.utilities.ByteUtil; import java.math.BigInteger; import java.util.Arrays; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java index 82ea00e42a..8347d36d63 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidKeyException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidKeyException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidKeyException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java similarity index 89% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java index b4c2ac7ce5..fed8369ff7 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMacException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMacException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidMacException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java index 3a797e9249..1a8f9e38de 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMessageException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidMessageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java index 48fbe3909c..90a6407bac 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/InvalidMetadataMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java @@ -1,4 +1,4 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; public class InvalidMetadataMessageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java similarity index 86% rename from libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java index b0ed28764e..d4ba2cffb7 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/InvalidVersionException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal; +package org.session.libsignal.exceptions; public class InvalidVersionException extends Exception { public InvalidVersionException(String detailMessage) { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java similarity index 90% rename from libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java index b2d981841a..def434ad0e 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java @@ -1,4 +1,4 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; public abstract class ProtocolException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java similarity index 67% rename from libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java index 6230fccaac..5371ac68ce 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/ProtocolInvalidMessageException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java @@ -1,8 +1,6 @@ -package org.session.libsignal.metadata; +package org.session.libsignal.exceptions; -import org.session.libsignal.libsignal.InvalidMessageException; - public class ProtocolInvalidMessageException extends ProtocolException { public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) { super(e, sender, senderDevice); diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java b/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java deleted file mode 100644 index 4cc30bfc6b..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/state/IdentityKeyStore.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ -package org.session.libsignal.libsignal.state; - -import org.session.libsignal.libsignal.IdentityKeyPair; - -/** - * Provides an interface to identity information. - * - * @author Moxie Marlinspike - */ -public interface IdentityKeyStore { - /** - * Get the local client's identity key pair. - * - * @return The local client's persistent identity key pair. - */ - public IdentityKeyPair getIdentityKeyPair(); - -} diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index ec8be2c45e..3f159be2f4 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api; -import org.session.libsignal.libsignal.InvalidMessageException; +import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java index 04217da2e1..94bfc2fe25 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java @@ -6,9 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream; +import org.session.libsignal.utilities.guava.Optional; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java index f8a859b3bd..e5d9641dbf 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; /** diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java index b5df001012..b4d27ee422 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java index b216332623..0b6d2fbc53 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.internal.push.SignalServiceProtos; public class SignalServiceContent { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java index f65568bc42..8ce3dca98e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.shared.SharedContact; import org.session.libsignal.service.api.push.SignalServiceAddress; import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java index 5115844a12..87285bc4fb 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java @@ -6,8 +6,7 @@ package org.session.libsignal.service.api.messages; -import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; +import org.session.libsignal.utilities.guava.Optional; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java index 6993eb8189..6a09521e4f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java @@ -1,6 +1,6 @@ package org.session.libsignal.service.api.messages.shared; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import java.util.LinkedList; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java b/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java index 2aa3a7f0c4..4033aef2e0 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java @@ -6,7 +6,7 @@ package org.session.libsignal.service.api.push; -import org.session.libsignal.libsignal.util.guava.Optional; +import org.session.libsignal.utilities.guava.Optional; /** * A class representing a message destination or origin. diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 4ad149698f..08924fa957 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -6,8 +6,8 @@ package org.session.libsignal.streams; -import org.session.libsignal.libsignal.InvalidMacException; -import org.session.libsignal.libsignal.InvalidMessageException; +import org.session.libsignal.exceptions.InvalidMacException; +import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.service.internal.util.Util; import java.io.File; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java b/libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java index 45ad5d6461..e9f540d6b1 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/ByteUtil.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ByteUtil.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; import org.session.libsignal.utilities.Hex; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt index d6ec9800be..70585af08b 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt @@ -1,6 +1,6 @@ package org.session.libsignal.service.loki.utilities -import org.session.libsignal.libsignal.IdentityKeyPair +import org.session.libsignal.crypto.IdentityKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair fun ByteArray.toHexString(): String { diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java b/libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java rename to libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java index b276beb6bc..0c807d1b92 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/KeyHelper.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/KeyHelper.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java b/libsignal/src/main/java/org/session/libsignal/utilities/Pair.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Pair.java index 430073f424..2f8de61a79 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/Pair.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Pair.java @@ -3,7 +3,7 @@ * * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.libsignal.util; +package org.session.libsignal.utilities; public class Pair { private final T1 v1; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java similarity index 93% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java index 1b7d8c1b26..c7dc282307 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Absent.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Absent.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.util.Collections; import java.util.Set; - /** * Implementation of an {@link Optional} not containing a reference. */ diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java index 5388b6ff1c..5e535d6cbe 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Function.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Function.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - - +package org.session.libsignal.utilities.guava; /** * Determines an output value based on an input value. diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java index c012c147dc..7ead442037 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Optional.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Optional.java @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.io.Serializable; import java.util.Set; - /** * An immutable object that may contain a non-null reference to another object. Each * instance of this type either contains a non-null reference, or contains nothing (in diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java similarity index 99% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java index 55edc0d18b..70c88dd381 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Preconditions.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Preconditions.java @@ -14,13 +14,10 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - +package org.session.libsignal.utilities.guava; import java.util.NoSuchElementException; - - /** * Simple static methods to be called at the start of your own methods to verify * correct arguments and state. This allows constructs such as diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java index e44561bebd..7194ba1bff 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Present.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Present.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; +package org.session.libsignal.utilities.guava; -import static org.session.libsignal.libsignal.util.guava.Preconditions.checkNotNull; +import static org.session.libsignal.utilities.guava.Preconditions.checkNotNull; import java.util.Collections; import java.util.Set; diff --git a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java similarity index 95% rename from libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java rename to libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java index e7ca97ffc5..4ff0e12ca0 100644 --- a/libsignal/src/main/java/org/session/libsignal/libsignal/util/guava/Supplier.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/guava/Supplier.java @@ -14,8 +14,7 @@ * limitations under the License. */ -package org.session.libsignal.libsignal.util.guava; - +package org.session.libsignal.utilities.guava; /** * A class that can supply objects of a single type. Semantically, this could From fa205c891523eacaaf1105e91ae1b4639249d62b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:29:10 +1000 Subject: [PATCH 24/29] Fix packages --- .../InvalidMetadataMessageException.java | 13 ----------- .../exceptions/InvalidVersionException.java | 12 ---------- .../exceptions/ProtocolException.java | 22 ------------------- .../ProtocolInvalidMessageException.java | 8 ------- .../streams/ContentLengthInputStream.java | 1 - .../streams/DigestingOutputStream.java | 1 - .../libsignal/utilities/HexEncoding.kt | 2 +- .../utilities/PrettifiedDescription.kt | 2 +- .../session/libsignal/utilities/Reflection.kt | 2 +- .../session/libsignal/utilities/Retrying.kt | 2 +- .../session/libsignal/utilities/Trimming.kt | 2 +- .../session/libsignal/utilities/Validation.kt | 2 +- 12 files changed, 6 insertions(+), 63 deletions(-) delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java delete mode 100644 libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java deleted file mode 100644 index 90a6407bac..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidMetadataMessageException.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.session.libsignal.exceptions; - - -public class InvalidMetadataMessageException extends Exception { - public InvalidMetadataMessageException(String s) { - super(s); - } - - public InvalidMetadataMessageException(Exception s) { - super(s); - } - -} diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java deleted file mode 100644 index d4ba2cffb7..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/exceptions/InvalidVersionException.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ -package org.session.libsignal.exceptions; - -public class InvalidVersionException extends Exception { - public InvalidVersionException(String detailMessage) { - super(detailMessage); - } -} diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java deleted file mode 100644 index def434ad0e..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolException.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.session.libsignal.exceptions; - - -public abstract class ProtocolException extends Exception { - - private final String sender; - private final int senderDevice; - - public ProtocolException(Exception e, String sender, int senderDevice) { - super(e); - this.sender = sender; - this.senderDevice = senderDevice; - } - - public String getSender() { - return sender; - } - - public int getSenderDevice() { - return senderDevice; - } -} diff --git a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java deleted file mode 100644 index 5371ac68ce..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/exceptions/ProtocolInvalidMessageException.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.session.libsignal.exceptions; - - -public class ProtocolInvalidMessageException extends ProtocolException { - public ProtocolInvalidMessageException(InvalidMessageException e, String sender, int senderDevice) { - super(e, sender, senderDevice); - } -} diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java index 8c7217cbb7..b1f5e2a081 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java @@ -1,6 +1,5 @@ package org.session.libsignal.streams; - import org.session.libsignal.service.internal.util.Util; import java.io.FilterInputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java index 331fa32c87..99f163199d 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingOutputStream.java @@ -1,6 +1,5 @@ package org.session.libsignal.streams; - import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt index 70585af08b..07b6ccced7 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/HexEncoding.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities import org.session.libsignal.crypto.IdentityKeyPair import org.session.libsignal.crypto.ecc.ECKeyPair diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt index 6f47f98f19..5f08f1b56e 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/PrettifiedDescription.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities fun Any.prettifiedDescription(): String { if (this is List<*>) { return prettifiedDescription() } diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt index 8554596ba1..11f5a28246 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Reflection.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities import kotlin.reflect.KProperty1 import kotlin.reflect.full.memberProperties diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt index b84f4c9317..ab0b9d484e 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Retrying.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt index 3a4115b04b..a5831800cc 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Trimming.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities import org.session.libsignal.utilities.Hex diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt index e8cd7e7b5f..d9b616d302 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Validation.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.utilities object PublicKeyValidation { From 961972a723ba7fe11926cf3db4809aff8a2c5e31 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:34:45 +1000 Subject: [PATCH 25/29] Move protos --- .../conversation/ConversationActivity.java | 4 +- .../activities/CreatePrivateChatActivity.kt | 2 +- .../activities/EditClosedGroupActivity.kt | 2 +- .../securesms/loki/activities/HomeActivity.kt | 2 +- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../loki/activities/QRCodeActivity.kt | 2 +- .../RecoveryPhraseRestoreActivity.kt | 2 +- .../loki/activities/RegisterActivity.kt | 2 +- .../securesms/loki/activities/SeedActivity.kt | 2 +- .../loki/api/LokiPushNotificationManager.kt | 2 +- .../loki/database/LokiAPIDatabase.kt | 6 +- .../securesms/loki/dialogs/SeedDialog.kt | 2 +- .../loki/protocol/ClosedGroupsMigration.kt | 6 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 4 +- .../messaging/file_server/FileServerAPI.kt | 2 +- .../messaging/jobs/NotifyPNServerJob.kt | 2 +- .../messaging/messages/Destination.kt | 2 +- .../control/ClosedGroupControlMessage.kt | 4 +- .../messages/control/ConfigurationMessage.kt | 4 +- .../messaging/open_groups/OpenGroupAPI.kt | 2 +- .../messaging/open_groups/OpenGroupAPIV2.kt | 4 +- .../messaging/open_groups/OpenGroupMessage.kt | 2 +- .../sending_receiving/MessageDecrypter.kt | 6 +- .../sending_receiving/MessageEncrypter.kt | 2 +- .../sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 4 +- .../ReceivedMessageHandler.kt | 4 +- .../notifications/PushNotificationAPI.kt | 2 +- .../pollers/ClosedGroupPoller.kt | 2 +- .../messaging/utilities/DotNetAPI.kt | 2 +- .../libsession/snode/OnionRequestAPI.kt | 3 +- .../snode/OnionRequestEncryption.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 6 +- .../session/libsession/snode/SnodeMessage.kt | 2 +- .../utilities/ProfilePictureUtilities.kt | 2 +- .../org/session/libsignal/crypto/Random.kt | 2 +- .../{metadata => protos}/SignalProtos.java | 388 +++++++++--------- 37 files changed, 246 insertions(+), 245 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{metadata => protos}/SignalProtos.java (80%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 1fbdc0f593..97e701ac43 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -115,8 +115,8 @@ import org.session.libsession.utilities.views.Stub; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.loki.Mention; -import org.session.libsignal.service.loki.utilities.HexEncodingKt; -import org.session.libsignal.service.loki.utilities.PublicKeyValidation; +import org.session.libsignal.utilities.HexEncodingKt; +import org.session.libsignal.utilities.PublicKeyValidation; import org.session.libsignal.utilities.ListenableFuture; import org.session.libsignal.utilities.SettableFuture; import org.session.libsignal.utilities.Log; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt index b2eab44fb9..ba3b623a8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.utilities.PublicKeyValidation +import org.session.libsignal.utilities.PublicKeyValidation class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt index 88c89f7319..3bb10b0096 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt @@ -32,7 +32,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.ThemeUtil -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.toHexString import java.io.IOException class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt index 9382bf83e6..b399d6e192 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt @@ -33,7 +33,7 @@ import org.session.libsession.messaging.mentions.MentionsManager import org.session.libsession.messaging.open_groups.OpenGroupAPI import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.utilities.* -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.ThreadUtils import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index ecb5ae743a..49662194e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -28,7 +28,7 @@ import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.crypto.MnemonicCodec -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.ApplicationContext diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt index f6b7e64433..bedd1f3121 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt @@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.loki.utilities.toPx import org.session.libsession.messaging.threads.recipients.Recipient import org.thoughtcrime.securesms.util.FileProviderUtil import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.utilities.PublicKeyValidation +import org.session.libsignal.utilities.PublicKeyValidation import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt index 6d526395df..c3e01217d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RecoveryPhraseRestoreActivity.kt @@ -16,7 +16,7 @@ import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.crypto.MnemonicCodec -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex import org.thoughtcrime.securesms.BaseActionBarActivity import org.session.libsession.utilities.KeyPairUtilities diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index d7d071da76..d84c1bc975 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -21,7 +21,7 @@ import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.KeyHelper -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity import org.session.libsession.utilities.KeyPairUtilities import org.thoughtcrime.securesms.loki.utilities.push diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt index 10fdc5cbc1..a7f10da4a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.MnemonicCodec -import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey +import org.session.libsignal.utilities.hexEncodedPrivateKey class SeedActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt index 40b99df2e5..05c6c768f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt @@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.retryIfNeeded object LokiPushNotificationManager { private val maxRetryCount = 4 diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index 6b92f066b7..1b77f213f1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -9,9 +9,9 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.loki.Snode import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol -import org.session.libsignal.service.loki.utilities.PublicKeyValidation -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.PublicKeyValidation +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.Database diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt index 8bd2e5c7da..da19275464 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt @@ -16,7 +16,7 @@ import network.loki.messenger.R import org.session.libsession.utilities.IdentityKeyUtil import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities import org.session.libsignal.crypto.MnemonicCodec -import org.session.libsignal.service.loki.utilities.hexEncodedPrivateKey +import org.session.libsignal.utilities.hexEncodedPrivateKey class SeedDialog : DialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt index 0f7cf57ddd..d5a333d8d0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsMigration.kt @@ -10,9 +10,9 @@ import org.session.libsignal.utilities.Hex import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.loki.utilities.PublicKeyValidation -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.PublicKeyValidation +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import java.util.* object ClosedGroupsMigration { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index f5a614ded0..9e867bbe61 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -10,8 +10,8 @@ import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.GroupDatabase import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt index a1b33b60b8..551567b569 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt @@ -9,7 +9,7 @@ import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol -import org.session.libsignal.service.loki.utilities.* +import org.session.libsignal.utilities.* import java.net.URL class FileServerAPI(public val server: String, userPublicKey: String, userPrivateKey: ByteArray, private val database: LokiAPIDatabaseProtocol) : DotNetAPI() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt index f1dd2fe091..f11f194891 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt @@ -15,7 +15,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.retryIfNeeded class NotifyPNServerJob(val message: SnodeMessage) : Job { override var delegate: JobDelegate? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt index 212e110b25..cfcd73efe0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.open_groups.OpenGroup import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.toHexString sealed class Destination { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 938c027b13..ee396c7069 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -10,8 +10,8 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt index 0a4dd4c27c..b8371ebaa1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt @@ -10,8 +10,8 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex class ConfigurationMessage(var closedGroups: List, var openGroups: List, var contacts: List, diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt index 4911598221..fa3d32c504 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.DownloadUtilities -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index 8bd44a9a19..a18e25850d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -17,8 +17,8 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.AESGCM import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.HTTP.Verb.* -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Base64.* import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt index 5ccf65377a..bc4f465170 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt index 902ed97dfc..b946ec3398 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageDecrypter.kt @@ -6,9 +6,9 @@ import com.goterl.lazycode.lazysodium.SodiumAndroid import com.goterl.lazycode.lazysodium.interfaces.Box import com.goterl.lazycode.lazysodium.interfaces.Sign import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex object MessageDecrypter { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt index 1745e2edee..b9c2fc66be 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.MessageSender.Error import org.session.libsession.utilities.KeyPairUtilities -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 483c3b98a2..cdd11d8581 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -23,7 +23,7 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.lang.IllegalStateException diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 7a07e2aef1..1beaf47229 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -17,8 +17,8 @@ import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.hexEncodedPublicKey +import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.ThreadUtils import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 956f3919ab..3435247695 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -26,8 +26,8 @@ import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.security.MessageDigest diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt index f10343be17..835f7aa8e5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt @@ -8,7 +8,7 @@ import okhttp3.RequestBody import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt index 09c698691d..385a273a16 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI -import org.session.libsignal.service.loki.utilities.getRandomElementOrNull +import org.session.libsignal.crypto.getRandomElementOrNull import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index b5bf24d33c..222efae16a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -22,7 +22,7 @@ import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStrea import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.HTTP -import org.session.libsignal.service.loki.utilities.* +import org.session.libsignal.utilities.* import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index 209fa12ac1..53de69fc2f 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -16,10 +16,11 @@ import org.session.libsignal.service.loki.* import org.session.libsession.utilities.AESGCM.EncryptionResult 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.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol -import org.session.libsignal.service.loki.utilities.* private typealias Path = List diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestEncryption.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestEncryption.kt index d4f19a678b..cd9ac4d1d8 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestEncryption.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestEncryption.kt @@ -4,7 +4,7 @@ import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred import org.session.libsession.utilities.AESGCM import org.session.libsession.utilities.AESGCM.EncryptionResult -import org.session.libsignal.service.loki.utilities.toHexString +import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.ThreadUtils import java.nio.Buffer diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index 239e70e537..01ba0aa0d9 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -13,9 +13,9 @@ 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.service.loki.utilities.prettifiedDescription -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.prettifiedDescription +import org.session.libsignal.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Log import java.security.SecureRandom diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt index b508cf0ef9..95ff6cb565 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeMessage.kt @@ -1,6 +1,6 @@ package org.session.libsession.snode -import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded +import org.session.libsignal.utilities.removing05PrefixIfNeeded data class SnodeMessage( /** diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index 14e9475cff..93f21054e9 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -10,7 +10,7 @@ import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory -import org.session.libsignal.service.loki.utilities.retryIfNeeded +import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.ThreadUtils import java.io.ByteArrayInputStream import java.util.* diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt b/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt index b1c1cd2af7..4f7687307b 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/Random.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki.utilities +package org.session.libsignal.crypto import java.security.SecureRandom diff --git a/libsignal/src/main/java/org/session/libsignal/metadata/SignalProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/SignalProtos.java similarity index 80% rename from libsignal/src/main/java/org/session/libsignal/metadata/SignalProtos.java rename to libsignal/src/main/java/org/session/libsignal/protos/SignalProtos.java index d80ad68544..bcbcf56b95 100644 --- a/libsignal/src/main/java/org/session/libsignal/metadata/SignalProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalProtos.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: UnidentifiedDelivery.proto -package org.session.libsignal.metadata; +package org.session.libsignal.protos; public final class SignalProtos { private SignalProtos() {} @@ -106,14 +106,14 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_fieldAccessorTable + return SignalProtos.internal_static_signal_ServerCertificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.ServerCertificate.class, org.session.libsignal.metadata.SignalProtos.ServerCertificate.Builder.class); + SignalProtos.ServerCertificate.class, SignalProtos.ServerCertificate.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -229,14 +229,14 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_Certificate_fieldAccessorTable + return SignalProtos.internal_static_signal_ServerCertificate_Certificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.class, org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.Builder.class); + SignalProtos.ServerCertificate.Certificate.class, SignalProtos.ServerCertificate.Certificate.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -338,53 +338,53 @@ public final class SignalProtos { return super.writeReplace(); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate 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.metadata.SignalProtos.ServerCertificate.Certificate parseFrom(byte[] data) + public static SignalProtos.ServerCertificate.Certificate parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom(java.io.InputStream input) + public static SignalProtos.ServerCertificate.Certificate parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseDelimitedFrom(java.io.InputStream input) + public static SignalProtos.ServerCertificate.Certificate parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseDelimitedFrom( + public static SignalProtos.ServerCertificate.Certificate parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parseFrom( + public static SignalProtos.ServerCertificate.Certificate parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -393,7 +393,7 @@ public final class SignalProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate prototype) { + public static Builder newBuilder(SignalProtos.ServerCertificate.Certificate prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -409,20 +409,20 @@ public final class SignalProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.metadata.SignalProtos.ServerCertificate.CertificateOrBuilder { + implements SignalProtos.ServerCertificate.CertificateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_Certificate_fieldAccessorTable + return SignalProtos.internal_static_signal_ServerCertificate_Certificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.class, org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.Builder.class); + SignalProtos.ServerCertificate.Certificate.class, SignalProtos.ServerCertificate.Certificate.Builder.class); } - // Construct using org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.newBuilder() + // Construct using org.session.libsignal.protos.SignalProtos.ServerCertificate.Certificate.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -455,23 +455,23 @@ public final class SignalProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_Certificate_descriptor; } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate getDefaultInstanceForType() { - return org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.getDefaultInstance(); + public SignalProtos.ServerCertificate.Certificate getDefaultInstanceForType() { + return SignalProtos.ServerCertificate.Certificate.getDefaultInstance(); } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate build() { - org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate result = buildPartial(); + public SignalProtos.ServerCertificate.Certificate build() { + SignalProtos.ServerCertificate.Certificate result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate buildPartial() { - org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate result = new org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate(this); + public SignalProtos.ServerCertificate.Certificate buildPartial() { + SignalProtos.ServerCertificate.Certificate result = new SignalProtos.ServerCertificate.Certificate(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -488,16 +488,16 @@ public final class SignalProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate) { - return mergeFrom((org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate)other); + if (other instanceof SignalProtos.ServerCertificate.Certificate) { + return mergeFrom((SignalProtos.ServerCertificate.Certificate)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate other) { - if (other == org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate.getDefaultInstance()) return this; + public Builder mergeFrom(SignalProtos.ServerCertificate.Certificate other) { + if (other == SignalProtos.ServerCertificate.Certificate.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -516,11 +516,11 @@ public final class SignalProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate parsedMessage = null; + SignalProtos.ServerCertificate.Certificate parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.metadata.SignalProtos.ServerCertificate.Certificate) e.getUnfinishedMessage(); + parsedMessage = (SignalProtos.ServerCertificate.Certificate) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -695,53 +695,53 @@ public final class SignalProtos { return super.writeReplace(); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate 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.metadata.SignalProtos.ServerCertificate parseFrom(byte[] data) + public static SignalProtos.ServerCertificate parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom(java.io.InputStream input) + public static SignalProtos.ServerCertificate parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseDelimitedFrom(java.io.InputStream input) + public static SignalProtos.ServerCertificate parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseDelimitedFrom( + public static SignalProtos.ServerCertificate parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.ServerCertificate parseFrom( + public static SignalProtos.ServerCertificate parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -750,7 +750,7 @@ public final class SignalProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.metadata.SignalProtos.ServerCertificate prototype) { + public static Builder newBuilder(SignalProtos.ServerCertificate prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -766,20 +766,20 @@ public final class SignalProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.metadata.SignalProtos.ServerCertificateOrBuilder { + implements SignalProtos.ServerCertificateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_fieldAccessorTable + return SignalProtos.internal_static_signal_ServerCertificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.ServerCertificate.class, org.session.libsignal.metadata.SignalProtos.ServerCertificate.Builder.class); + SignalProtos.ServerCertificate.class, SignalProtos.ServerCertificate.Builder.class); } - // Construct using org.session.libsignal.metadata.SignalProtos.ServerCertificate.newBuilder() + // Construct using org.session.libsignal.protos.SignalProtos.ServerCertificate.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -812,23 +812,23 @@ public final class SignalProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_ServerCertificate_descriptor; + return SignalProtos.internal_static_signal_ServerCertificate_descriptor; } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate getDefaultInstanceForType() { - return org.session.libsignal.metadata.SignalProtos.ServerCertificate.getDefaultInstance(); + public SignalProtos.ServerCertificate getDefaultInstanceForType() { + return SignalProtos.ServerCertificate.getDefaultInstance(); } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate build() { - org.session.libsignal.metadata.SignalProtos.ServerCertificate result = buildPartial(); + public SignalProtos.ServerCertificate build() { + SignalProtos.ServerCertificate result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.metadata.SignalProtos.ServerCertificate buildPartial() { - org.session.libsignal.metadata.SignalProtos.ServerCertificate result = new org.session.libsignal.metadata.SignalProtos.ServerCertificate(this); + public SignalProtos.ServerCertificate buildPartial() { + SignalProtos.ServerCertificate result = new SignalProtos.ServerCertificate(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -845,16 +845,16 @@ public final class SignalProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.metadata.SignalProtos.ServerCertificate) { - return mergeFrom((org.session.libsignal.metadata.SignalProtos.ServerCertificate)other); + if (other instanceof SignalProtos.ServerCertificate) { + return mergeFrom((SignalProtos.ServerCertificate)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.metadata.SignalProtos.ServerCertificate other) { - if (other == org.session.libsignal.metadata.SignalProtos.ServerCertificate.getDefaultInstance()) return this; + public Builder mergeFrom(SignalProtos.ServerCertificate other) { + if (other == SignalProtos.ServerCertificate.getDefaultInstance()) return this; if (other.hasCertificate()) { setCertificate(other.getCertificate()); } @@ -873,11 +873,11 @@ public final class SignalProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.metadata.SignalProtos.ServerCertificate parsedMessage = null; + SignalProtos.ServerCertificate parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.metadata.SignalProtos.ServerCertificate) e.getUnfinishedMessage(); + parsedMessage = (SignalProtos.ServerCertificate) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1074,14 +1074,14 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_SenderCertificate_descriptor; + return SignalProtos.internal_static_signal_SenderCertificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_SenderCertificate_fieldAccessorTable + return SignalProtos.internal_static_signal_SenderCertificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.SenderCertificate.class, org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder.class); + SignalProtos.SenderCertificate.class, SignalProtos.SenderCertificate.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1210,53 +1210,53 @@ public final class SignalProtos { return super.writeReplace(); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate 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.metadata.SignalProtos.SenderCertificate parseFrom(byte[] data) + public static SignalProtos.SenderCertificate parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom(java.io.InputStream input) + public static SignalProtos.SenderCertificate parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseDelimitedFrom(java.io.InputStream input) + public static SignalProtos.SenderCertificate parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseDelimitedFrom( + public static SignalProtos.SenderCertificate parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.SenderCertificate parseFrom( + public static SignalProtos.SenderCertificate parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1265,7 +1265,7 @@ public final class SignalProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.metadata.SignalProtos.SenderCertificate prototype) { + public static Builder newBuilder(SignalProtos.SenderCertificate prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1281,20 +1281,20 @@ public final class SignalProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder { + implements SignalProtos.SenderCertificateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_SenderCertificate_descriptor; + return SignalProtos.internal_static_signal_SenderCertificate_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_SenderCertificate_fieldAccessorTable + return SignalProtos.internal_static_signal_SenderCertificate_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.SenderCertificate.class, org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder.class); + SignalProtos.SenderCertificate.class, SignalProtos.SenderCertificate.Builder.class); } - // Construct using org.session.libsignal.metadata.SignalProtos.SenderCertificate.newBuilder() + // Construct using org.session.libsignal.protos.SignalProtos.SenderCertificate.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1327,23 +1327,23 @@ public final class SignalProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_SenderCertificate_descriptor; + return SignalProtos.internal_static_signal_SenderCertificate_descriptor; } - public org.session.libsignal.metadata.SignalProtos.SenderCertificate getDefaultInstanceForType() { - return org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance(); + public SignalProtos.SenderCertificate getDefaultInstanceForType() { + return SignalProtos.SenderCertificate.getDefaultInstance(); } - public org.session.libsignal.metadata.SignalProtos.SenderCertificate build() { - org.session.libsignal.metadata.SignalProtos.SenderCertificate result = buildPartial(); + public SignalProtos.SenderCertificate build() { + SignalProtos.SenderCertificate result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.metadata.SignalProtos.SenderCertificate buildPartial() { - org.session.libsignal.metadata.SignalProtos.SenderCertificate result = new org.session.libsignal.metadata.SignalProtos.SenderCertificate(this); + public SignalProtos.SenderCertificate buildPartial() { + SignalProtos.SenderCertificate result = new SignalProtos.SenderCertificate(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1360,16 +1360,16 @@ public final class SignalProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.metadata.SignalProtos.SenderCertificate) { - return mergeFrom((org.session.libsignal.metadata.SignalProtos.SenderCertificate)other); + if (other instanceof SignalProtos.SenderCertificate) { + return mergeFrom((SignalProtos.SenderCertificate)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.metadata.SignalProtos.SenderCertificate other) { - if (other == org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance()) return this; + public Builder mergeFrom(SignalProtos.SenderCertificate other) { + if (other == SignalProtos.SenderCertificate.getDefaultInstance()) return this; if (other.hasSender()) { bitField0_ |= 0x00000001; sender_ = other.sender_; @@ -1390,11 +1390,11 @@ public final class SignalProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.metadata.SignalProtos.SenderCertificate parsedMessage = null; + SignalProtos.SenderCertificate parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.metadata.SignalProtos.SenderCertificate) e.getUnfinishedMessage(); + parsedMessage = (SignalProtos.SenderCertificate) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1636,14 +1636,14 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_fieldAccessorTable + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.class, org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Builder.class); + SignalProtos.UnidentifiedSenderMessage.class, SignalProtos.UnidentifiedSenderMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1672,7 +1672,7 @@ public final class SignalProtos { /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type getType(); + SignalProtos.UnidentifiedSenderMessage.Message.Type getType(); // optional .signal.SenderCertificate senderCertificate = 2; /** @@ -1682,11 +1682,11 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - org.session.libsignal.metadata.SignalProtos.SenderCertificate getSenderCertificate(); + SignalProtos.SenderCertificate getSenderCertificate(); /** * optional .signal.SenderCertificate senderCertificate = 2; */ - org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder(); + SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder(); // optional bytes content = 3; /** @@ -1751,7 +1751,7 @@ public final class SignalProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type value = org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type.valueOf(rawValue); + SignalProtos.UnidentifiedSenderMessage.Message.Type value = SignalProtos.UnidentifiedSenderMessage.Message.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -1761,11 +1761,11 @@ public final class SignalProtos { break; } case 18: { - org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder subBuilder = null; + SignalProtos.SenderCertificate.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = senderCertificate_.toBuilder(); } - senderCertificate_ = input.readMessage(org.session.libsignal.metadata.SignalProtos.SenderCertificate.PARSER, extensionRegistry); + senderCertificate_ = input.readMessage(SignalProtos.SenderCertificate.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(senderCertificate_); senderCertificate_ = subBuilder.buildPartial(); @@ -1792,14 +1792,14 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_fieldAccessorTable + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.class, org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Builder.class); + SignalProtos.UnidentifiedSenderMessage.Message.class, SignalProtos.UnidentifiedSenderMessage.Message.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1883,7 +1883,7 @@ public final class SignalProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.getDescriptor().getEnumTypes().get(0); + return SignalProtos.UnidentifiedSenderMessage.Message.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -1911,7 +1911,7 @@ public final class SignalProtos { private int bitField0_; // optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type type_; + private SignalProtos.UnidentifiedSenderMessage.Message.Type type_; /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ @@ -1921,13 +1921,13 @@ public final class SignalProtos { /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type getType() { + public SignalProtos.UnidentifiedSenderMessage.Message.Type getType() { return type_; } // optional .signal.SenderCertificate senderCertificate = 2; public static final int SENDERCERTIFICATE_FIELD_NUMBER = 2; - private org.session.libsignal.metadata.SignalProtos.SenderCertificate senderCertificate_; + private SignalProtos.SenderCertificate senderCertificate_; /** * optional .signal.SenderCertificate senderCertificate = 2; */ @@ -1937,13 +1937,13 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public org.session.libsignal.metadata.SignalProtos.SenderCertificate getSenderCertificate() { + public SignalProtos.SenderCertificate getSenderCertificate() { return senderCertificate_; } /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder() { + public SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder() { return senderCertificate_; } @@ -1964,8 +1964,8 @@ public final class SignalProtos { } private void initFields() { - type_ = org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; - senderCertificate_ = org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance(); + type_ = SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; + senderCertificate_ = SignalProtos.SenderCertificate.getDefaultInstance(); content_ = com.google.protobuf.ByteString.EMPTY; } private byte memoizedIsInitialized = -1; @@ -2022,53 +2022,53 @@ public final class SignalProtos { return super.writeReplace(); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message 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.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom(byte[] data) + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom(java.io.InputStream input) + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseDelimitedFrom(java.io.InputStream input) + public static SignalProtos.UnidentifiedSenderMessage.Message parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseDelimitedFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parseFrom( + public static SignalProtos.UnidentifiedSenderMessage.Message parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2077,7 +2077,7 @@ public final class SignalProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message prototype) { + public static Builder newBuilder(SignalProtos.UnidentifiedSenderMessage.Message prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2093,20 +2093,20 @@ public final class SignalProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.MessageOrBuilder { + implements SignalProtos.UnidentifiedSenderMessage.MessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_fieldAccessorTable + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.class, org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Builder.class); + SignalProtos.UnidentifiedSenderMessage.Message.class, SignalProtos.UnidentifiedSenderMessage.Message.Builder.class); } - // Construct using org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.newBuilder() + // Construct using org.session.libsignal.protos.SignalProtos.UnidentifiedSenderMessage.Message.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2127,10 +2127,10 @@ public final class SignalProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; + type_ = SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; bitField0_ = (bitField0_ & ~0x00000001); if (senderCertificateBuilder_ == null) { - senderCertificate_ = org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance(); + senderCertificate_ = SignalProtos.SenderCertificate.getDefaultInstance(); } else { senderCertificateBuilder_.clear(); } @@ -2146,23 +2146,23 @@ public final class SignalProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_Message_descriptor; } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message getDefaultInstanceForType() { - return org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.getDefaultInstance(); + public SignalProtos.UnidentifiedSenderMessage.Message getDefaultInstanceForType() { + return SignalProtos.UnidentifiedSenderMessage.Message.getDefaultInstance(); } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message build() { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message result = buildPartial(); + public SignalProtos.UnidentifiedSenderMessage.Message build() { + SignalProtos.UnidentifiedSenderMessage.Message result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message buildPartial() { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message result = new org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message(this); + public SignalProtos.UnidentifiedSenderMessage.Message buildPartial() { + SignalProtos.UnidentifiedSenderMessage.Message result = new SignalProtos.UnidentifiedSenderMessage.Message(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2187,16 +2187,16 @@ public final class SignalProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message) { - return mergeFrom((org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message)other); + if (other instanceof SignalProtos.UnidentifiedSenderMessage.Message) { + return mergeFrom((SignalProtos.UnidentifiedSenderMessage.Message)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message other) { - if (other == org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.getDefaultInstance()) return this; + public Builder mergeFrom(SignalProtos.UnidentifiedSenderMessage.Message other) { + if (other == SignalProtos.UnidentifiedSenderMessage.Message.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -2218,11 +2218,11 @@ public final class SignalProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message parsedMessage = null; + SignalProtos.UnidentifiedSenderMessage.Message parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message) e.getUnfinishedMessage(); + parsedMessage = (SignalProtos.UnidentifiedSenderMessage.Message) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2234,7 +2234,7 @@ public final class SignalProtos { private int bitField0_; // optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; - private org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type type_ = org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; + private SignalProtos.UnidentifiedSenderMessage.Message.Type type_ = SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ @@ -2244,13 +2244,13 @@ public final class SignalProtos { /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type getType() { + public SignalProtos.UnidentifiedSenderMessage.Message.Type getType() { return type_; } /** * optional .signal.UnidentifiedSenderMessage.Message.Type type = 1; */ - public Builder setType(org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type value) { + public Builder setType(SignalProtos.UnidentifiedSenderMessage.Message.Type value) { if (value == null) { throw new NullPointerException(); } @@ -2264,15 +2264,15 @@ public final class SignalProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; + type_ = SignalProtos.UnidentifiedSenderMessage.Message.Type.PREKEY_MESSAGE; onChanged(); return this; } // optional .signal.SenderCertificate senderCertificate = 2; - private org.session.libsignal.metadata.SignalProtos.SenderCertificate senderCertificate_ = org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance(); + private SignalProtos.SenderCertificate senderCertificate_ = SignalProtos.SenderCertificate.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.metadata.SignalProtos.SenderCertificate, org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder, org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder> senderCertificateBuilder_; + SignalProtos.SenderCertificate, SignalProtos.SenderCertificate.Builder, SignalProtos.SenderCertificateOrBuilder> senderCertificateBuilder_; /** * optional .signal.SenderCertificate senderCertificate = 2; */ @@ -2282,7 +2282,7 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public org.session.libsignal.metadata.SignalProtos.SenderCertificate getSenderCertificate() { + public SignalProtos.SenderCertificate getSenderCertificate() { if (senderCertificateBuilder_ == null) { return senderCertificate_; } else { @@ -2292,7 +2292,7 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public Builder setSenderCertificate(org.session.libsignal.metadata.SignalProtos.SenderCertificate value) { + public Builder setSenderCertificate(SignalProtos.SenderCertificate value) { if (senderCertificateBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2309,7 +2309,7 @@ public final class SignalProtos { * optional .signal.SenderCertificate senderCertificate = 2; */ public Builder setSenderCertificate( - org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder builderForValue) { + SignalProtos.SenderCertificate.Builder builderForValue) { if (senderCertificateBuilder_ == null) { senderCertificate_ = builderForValue.build(); onChanged(); @@ -2322,12 +2322,12 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public Builder mergeSenderCertificate(org.session.libsignal.metadata.SignalProtos.SenderCertificate value) { + public Builder mergeSenderCertificate(SignalProtos.SenderCertificate value) { if (senderCertificateBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - senderCertificate_ != org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance()) { + senderCertificate_ != SignalProtos.SenderCertificate.getDefaultInstance()) { senderCertificate_ = - org.session.libsignal.metadata.SignalProtos.SenderCertificate.newBuilder(senderCertificate_).mergeFrom(value).buildPartial(); + SignalProtos.SenderCertificate.newBuilder(senderCertificate_).mergeFrom(value).buildPartial(); } else { senderCertificate_ = value; } @@ -2343,7 +2343,7 @@ public final class SignalProtos { */ public Builder clearSenderCertificate() { if (senderCertificateBuilder_ == null) { - senderCertificate_ = org.session.libsignal.metadata.SignalProtos.SenderCertificate.getDefaultInstance(); + senderCertificate_ = SignalProtos.SenderCertificate.getDefaultInstance(); onChanged(); } else { senderCertificateBuilder_.clear(); @@ -2354,7 +2354,7 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder getSenderCertificateBuilder() { + public SignalProtos.SenderCertificate.Builder getSenderCertificateBuilder() { bitField0_ |= 0x00000002; onChanged(); return getSenderCertificateFieldBuilder().getBuilder(); @@ -2362,7 +2362,7 @@ public final class SignalProtos { /** * optional .signal.SenderCertificate senderCertificate = 2; */ - public org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder() { + public SignalProtos.SenderCertificateOrBuilder getSenderCertificateOrBuilder() { if (senderCertificateBuilder_ != null) { return senderCertificateBuilder_.getMessageOrBuilder(); } else { @@ -2373,11 +2373,11 @@ public final class SignalProtos { * optional .signal.SenderCertificate senderCertificate = 2; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.metadata.SignalProtos.SenderCertificate, org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder, org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder> + SignalProtos.SenderCertificate, SignalProtos.SenderCertificate.Builder, SignalProtos.SenderCertificateOrBuilder> getSenderCertificateFieldBuilder() { if (senderCertificateBuilder_ == null) { senderCertificateBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.metadata.SignalProtos.SenderCertificate, org.session.libsignal.metadata.SignalProtos.SenderCertificate.Builder, org.session.libsignal.metadata.SignalProtos.SenderCertificateOrBuilder>( + SignalProtos.SenderCertificate, SignalProtos.SenderCertificate.Builder, SignalProtos.SenderCertificateOrBuilder>( senderCertificate_, getParentForChildren(), isClean()); @@ -2541,53 +2541,53 @@ public final class SignalProtos { return super.writeReplace(); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage 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.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom(byte[] data) + public static SignalProtos.UnidentifiedSenderMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom(java.io.InputStream input) + public static SignalProtos.UnidentifiedSenderMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalProtos.UnidentifiedSenderMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseDelimitedFrom( + public static SignalProtos.UnidentifiedSenderMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parseFrom( + public static SignalProtos.UnidentifiedSenderMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2596,7 +2596,7 @@ public final class SignalProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage prototype) { + public static Builder newBuilder(SignalProtos.UnidentifiedSenderMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2612,20 +2612,20 @@ public final class SignalProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessageOrBuilder { + implements SignalProtos.UnidentifiedSenderMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_fieldAccessorTable + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.class, org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.Builder.class); + SignalProtos.UnidentifiedSenderMessage.class, SignalProtos.UnidentifiedSenderMessage.Builder.class); } - // Construct using org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalProtos.UnidentifiedSenderMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2660,23 +2660,23 @@ public final class SignalProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.metadata.SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; + return SignalProtos.internal_static_signal_UnidentifiedSenderMessage_descriptor; } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage getDefaultInstanceForType() { - return org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.getDefaultInstance(); + public SignalProtos.UnidentifiedSenderMessage getDefaultInstanceForType() { + return SignalProtos.UnidentifiedSenderMessage.getDefaultInstance(); } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage build() { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage result = buildPartial(); + public SignalProtos.UnidentifiedSenderMessage build() { + SignalProtos.UnidentifiedSenderMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage buildPartial() { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage result = new org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage(this); + public SignalProtos.UnidentifiedSenderMessage buildPartial() { + SignalProtos.UnidentifiedSenderMessage result = new SignalProtos.UnidentifiedSenderMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2697,16 +2697,16 @@ public final class SignalProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage) { - return mergeFrom((org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage)other); + if (other instanceof SignalProtos.UnidentifiedSenderMessage) { + return mergeFrom((SignalProtos.UnidentifiedSenderMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage other) { - if (other == org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalProtos.UnidentifiedSenderMessage other) { + if (other == SignalProtos.UnidentifiedSenderMessage.getDefaultInstance()) return this; if (other.hasEphemeralPublic()) { setEphemeralPublic(other.getEphemeralPublic()); } @@ -2728,11 +2728,11 @@ public final class SignalProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage parsedMessage = null; + SignalProtos.UnidentifiedSenderMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.metadata.SignalProtos.UnidentifiedSenderMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalProtos.UnidentifiedSenderMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { From c124f86f6bb2ddf55480118cb7c745972517194e Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:36:20 +1000 Subject: [PATCH 26/29] Move protos --- .../securesms/loki/utilities/Broadcaster.kt | 2 +- .../messaging/utilities/MessageWrapper.kt | 4 +- .../libsession/snode/OnionRequestAPI.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../session/libsession/snode/SnodeModule.kt | 2 +- .../websocket => protos}/WebSocketProtos.java | 304 +++++++++--------- .../loki => utilities}/Broadcaster.kt | 2 +- 7 files changed, 159 insertions(+), 159 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{service/internal/websocket => protos}/WebSocketProtos.java (79%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Broadcaster.kt (71%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt index dfc42c9340..74429f394a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt @@ -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 { diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt index f90381b2f7..d84195752b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt @@ -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 { diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index 53de69fc2f..bbfb9e10e9 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -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 diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index 01ba0aa0d9..a355dbaa29 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -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 diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt index 0d9381ab95..92faffcba4 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt @@ -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) { diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/websocket/WebSocketProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java similarity index 79% rename from libsignal/src/main/java/org/session/libsignal/service/internal/websocket/WebSocketProtos.java rename to libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java index d123d4813b..471ab603d0 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/websocket/WebSocketProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/WebSocketProtos.java @@ -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 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 - 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 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 - 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 { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - 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 { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage getRequest(); + WebSocketProtos.WebSocketRequestMessage getRequest(); /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage getResponse(); + WebSocketProtos.WebSocketResponseMessage getResponse(); /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 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_; /** * optional .signalservice.WebSocketMessage.Type type = 1; */ @@ -2159,13 +2159,13 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - 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_; /** * optional .signalservice.WebSocketRequestMessage request = 2; */ @@ -2175,19 +2175,19 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - public org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage getRequest() { + public WebSocketProtos.WebSocketRequestMessage getRequest() { return request_; } /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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_; /** * optional .signalservice.WebSocketResponseMessage response = 3; */ @@ -2197,20 +2197,20 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - public org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketResponseMessage getResponse() { + public WebSocketProtos.WebSocketResponseMessage getResponse() { return response_; } /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 - 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; /** * optional .signalservice.WebSocketMessage.Type type = 1; */ @@ -2497,13 +2497,13 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - public org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketMessage.Type getType() { + public WebSocketProtos.WebSocketMessage.Type getType() { return type_; } /** * optional .signalservice.WebSocketMessage.Type type = 1; */ - 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_; /** * optional .signalservice.WebSocketRequestMessage request = 2; */ @@ -2535,7 +2535,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { * optional .signalservice.WebSocketRequestMessage request = 2; */ 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 { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { /** * optional .signalservice.WebSocketRequestMessage request = 2; */ - 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 { * optional .signalservice.WebSocketRequestMessage request = 2; */ 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_; /** * optional .signalservice.WebSocketResponseMessage response = 3; */ @@ -2652,7 +2652,7 @@ public final class WebSocketProtos { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 { * optional .signalservice.WebSocketResponseMessage response = 3; */ 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 { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 { /** * optional .signalservice.WebSocketResponseMessage response = 3; */ - 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 { * optional .signalservice.WebSocketResponseMessage response = 3; */ 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()); diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Broadcaster.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Broadcaster.kt similarity index 71% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Broadcaster.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Broadcaster.kt index a251b89459..0af650ea67 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/Broadcaster.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Broadcaster.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.utilities interface Broadcaster { From dc8938c2692981f67612acd511ec4cb155241709 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:44:06 +1000 Subject: [PATCH 27/29] Move protos --- .../securesms/database/PushDatabase.java | 2 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 4 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 6 +- .../libsession/messaging/messages/Message.kt | 2 +- .../control/ClosedGroupControlMessage.kt | 4 +- .../messages/control/ConfigurationMessage.kt | 2 +- .../control/DataExtractionNotification.kt | 2 +- .../messages/control/ExpirationTimerUpdate.kt | 2 +- .../messaging/messages/control/ReadReceipt.kt | 2 +- .../messages/control/TypingIndicator.kt | 2 +- .../messaging/messages/visible/Attachment.kt | 2 +- .../messaging/messages/visible/LinkPreview.kt | 2 +- .../messages/visible/OpenGroupInvitation.kt | 2 +- .../messaging/messages/visible/Profile.kt | 2 +- .../messaging/messages/visible/Quote.kt | 2 +- .../messages/visible/VisibleMessage.kt | 2 +- .../open_groups/OpenGroupMessageV2.kt | 2 +- .../sending_receiving/MessageReceiver.kt | 2 +- .../sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../ReceivedMessageHandler.kt | 2 +- .../attachments/PointerAttachment.java | 2 +- .../SessionServiceAttachmentStream.kt | 2 +- .../notifications/MessageNotifier.kt | 2 - .../pollers/OpenGroupPoller.kt | 2 +- .../pollers/OpenGroupV2Poller.kt | 2 +- .../libsession/messaging/threads/Address.kt | 2 +- .../messaging/utilities/DotNetAPI.kt | 7 +- .../messaging/utilities/MessageWrapper.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../session/libsession/utilities/AESGCM.kt | 2 +- .../utilities/ProfilePictureUtilities.kt | 4 +- .../libsession/utilities/SSKEnvironment.kt | 1 - .../session/libsignal/crypto/DiffieHellman.kt | 2 +- .../push => protos}/SignalServiceProtos.java | 2412 ++++++++--------- .../api/messages/SignalServiceContent.java | 2 +- .../messages/SignalServiceDataMessage.java | 2 +- .../api/messages/SignalServiceEnvelope.java | 2 +- .../internal/push/ProfileAvatarData.java | 2 +- .../internal/push/PushAttachmentData.java | 2 +- .../streams/AttachmentCipherInputStream.java | 2 +- .../streams/AttachmentCipherOutputStream.java | 2 +- .../AttachmentCipherOutputStreamFactory.java | 5 +- .../streams/ContentLengthInputStream.java | 2 +- .../DigestingRequestBody.java | 4 +- .../http => streams}/OutputStreamFactory.java | 6 +- .../libsignal/streams/PaddingInputStream.java | 2 +- .../streams/PlaintextOutputStreamFactory.kt | 1 - .../streams/ProfileCipherInputStream.java | 2 +- .../ProfileCipherOutputStreamFactory.java | 6 +- .../internal/util => utilities}/Util.java | 2 +- 52 files changed, 1261 insertions(+), 1279 deletions(-) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => protos}/SignalServiceProtos.java (78%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push/http => streams}/AttachmentCipherOutputStreamFactory.java (68%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push/http => streams}/DigestingRequestBody.java (94%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push/http => streams}/OutputStreamFactory.java (59%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push/http => streams}/ProfileCipherOutputStreamFactory.java (68%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/util => utilities}/Util.java (98%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index e9d417de5d..70db382976 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceEnvelope; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 9e867bbe61..646d2ac8c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -8,8 +8,8 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage +import org.session.libsignal.protos.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 000327b351..a0770d2d7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -44,7 +44,7 @@ import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contactshare.ContactUtil; diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index a89831a140..d4622f9031 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -17,9 +17,9 @@ import org.session.libsignal.streams.AttachmentCipherOutputStream import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream import org.session.libsignal.streams.PaddingInputStream import org.session.libsignal.service.internal.push.PushAttachmentData -import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputStreamFactory -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.streams.AttachmentCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.utilities.Util import org.session.libsignal.streams.PlaintextOutputStreamFactory import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt index 323c3fd263..56779795ea 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages import com.google.protobuf.ByteString import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos abstract class Message { var id: Long? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index ee396c7069..0a393608fc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -8,8 +8,8 @@ import org.session.libsession.utilities.GroupUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage +import org.session.libsignal.protos.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt index b8371ebaa1..79fd100a8b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt @@ -9,7 +9,7 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt index a58cb8166b..9789a33af3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class DataExtractionNotification() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt index 5ce55ed832..97233d6a23 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class ExpirationTimerUpdate() : ControlMessage() { /** In the case of a sync message, the public key of the person the message was targeted at. diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt index d27dc1f732..e0c7b690bc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class ReadReceipt() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt index 649a93308e..c755751ba6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.control -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class TypingIndicator() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index ecfc3feb52..ee5a7f3fe3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import java.io.File class Attachment { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt index 91c68779c6..6187c9a9e3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class LinkPreview() { var title: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt index f26ce81dde..71faa53769 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -1,6 +1,6 @@ package org.session.libsession.messaging.messages.visible -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log class OpenGroupInvitation() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt index bc79381ebc..cf792e6a84 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.visible import com.google.protobuf.ByteString import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class Profile() { var displayName: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt index 69f2300a01..21b9200d64 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos class Quote() { var timestamp: Long? = 0 diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 298ccdf006..08451f9c39 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 49fa9c76b5..0a606ad3fd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt index 6335bd92f8..2052de4f6d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt @@ -6,7 +6,7 @@ import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos object MessageReceiver { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index cdd11d8581..28b778c5fa 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -22,7 +22,7 @@ import org.session.libsession.snode.SnodeMessage import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsignal.service.internal.push.PushTransportDetails -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 1beaf47229..207b0bedd1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -16,7 +16,7 @@ import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 3435247695..12aef6120f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -25,7 +25,7 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index 2f038f913f..d6ba340dc0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -9,7 +9,7 @@ import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceAttachment; import org.session.libsignal.service.api.messages.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; -import org.session.libsignal.service.internal.push.SignalServiceProtos; +import org.session.libsignal.protos.SignalServiceProtos; import java.util.LinkedList; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 634557eddd..6f20657a58 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -8,7 +8,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import android.util.Size import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment import java.io.InputStream import kotlin.math.round diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt index 7243415247..4a7889b75d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt @@ -2,8 +2,6 @@ package org.session.libsession.messaging.sending_receiving.notifications import android.content.Context import org.session.libsession.messaging.threads.recipients.Recipient -import org.session.libsignal.service.api.messages.SignalServiceGroup -import org.session.libsignal.service.internal.push.SignalServiceProtos interface MessageNotifier { fun setVisibleThread(threadId: Long) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt index 9c3b3f582f..9c37e1e8b9 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt @@ -11,7 +11,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPI import org.session.libsession.messaging.open_groups.OpenGroupMessage import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos.* +import org.session.libsignal.protos.SignalServiceProtos.* import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt index ab84252805..35d1624231 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupMessageV2 import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.concurrent.ScheduledExecutorService diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt index 33c83b036d..ca2f803ff5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt @@ -8,7 +8,7 @@ import androidx.annotation.VisibleForTesting import org.session.libsession.utilities.DelimiterUtil import org.session.libsession.utilities.GroupUtil import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import java.util.* import java.util.concurrent.atomic.AtomicReference import java.util.regex.Matcher diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 222efae16a..0567f73c4f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -17,13 +17,12 @@ import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails import org.session.libsignal.service.internal.push.ProfileAvatarData import org.session.libsignal.service.internal.push.PushAttachmentData -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.HTTP import org.session.libsignal.utilities.* -import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import java.util.* @@ -210,7 +209,7 @@ open class DotNetAPI { fun uploadProfilePicture(server: String, key: ByteArray, profilePicture: StreamDetails, setLastProfilePictureUpload: () -> Unit): UploadResult { val profilePictureUploadData = ProfileAvatarData(profilePicture.stream, ProfileCipherOutputStream.getCiphertextLength(profilePicture.length), profilePicture.contentType, ProfileCipherOutputStreamFactory(key)) val file = DigestingRequestBody(profilePictureUploadData.data, profilePictureUploadData.outputStreamFactory, - profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null) + profilePictureUploadData.contentType, profilePictureUploadData.dataLength, null) val body = MultipartBody.Builder() .setType(MultipartBody.FORM) .addFormDataPart("type", "network.loki") diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt index d84195752b..569b9c62c1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.utilities import com.google.protobuf.ByteString import org.session.libsignal.utilities.Log -import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope +import org.session.libsignal.protos.SignalServiceProtos.Envelope import org.session.libsignal.protos.WebSocketProtos.WebSocketMessage import org.session.libsignal.protos.WebSocketProtos.WebSocketRequestMessage import java.security.SecureRandom diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index a355dbaa29..21581d255f 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -8,7 +8,7 @@ import nl.komponents.kovenant.functional.bind import nl.komponents.kovenant.functional.map import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement -import org.session.libsignal.service.internal.push.SignalServiceProtos +import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.service.loki.Snode import org.session.libsignal.utilities.HTTP import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol diff --git a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt index 4de7266a41..225900b096 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/AESGCM.kt @@ -2,7 +2,7 @@ package org.session.libsession.utilities import androidx.annotation.WorkerThread import org.session.libsignal.utilities.ByteUtil -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import org.session.libsignal.utilities.Hex import org.whispersystems.curve25519.Curve25519 import javax.crypto.Cipher diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index 93f21054e9..ddffb2cc2c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -8,8 +8,8 @@ import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.streams.ProfileCipherOutputStream import org.session.libsignal.service.internal.push.ProfileAvatarData -import org.session.libsignal.service.internal.push.http.DigestingRequestBody -import org.session.libsignal.service.internal.push.http.ProfileCipherOutputStreamFactory +import org.session.libsignal.streams.DigestingRequestBody +import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.retryIfNeeded import org.session.libsignal.utilities.ThreadUtils import java.io.ByteArrayInputStream diff --git a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt index 2e2bf37de4..f3a130e847 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt @@ -5,7 +5,6 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient -import org.session.libsignal.service.internal.push.SignalServiceProtos class SSKEnvironment( val typingIndicators: TypingIndicatorsProtocol, diff --git a/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt index 8e009334ad..2b613247bf 100644 --- a/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt +++ b/libsignal/src/main/java/org/session/libsignal/crypto/DiffieHellman.kt @@ -1,7 +1,7 @@ package org.session.libsignal.crypto import org.whispersystems.curve25519.Curve25519 -import org.session.libsignal.service.internal.util.Util +import org.session.libsignal.utilities.Util import javax.crypto.Cipher import javax.crypto.spec.IvParameterSpec import javax.crypto.spec.SecretKeySpec diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java similarity index 78% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java rename to libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java index 773b46f092..5bd3d84d51 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java +++ b/libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: SignalService.proto -package org.session.libsignal.service.internal.push; +package org.session.libsignal.protos; public final class SignalServiceProtos { private SignalServiceProtos() {} @@ -27,7 +27,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType(); + SignalServiceProtos.Envelope.Type getType(); // optional string source = 2; /** @@ -145,7 +145,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.valueOf(rawValue); + SignalServiceProtos.Envelope.Type value = SignalServiceProtos.Envelope.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -193,14 +193,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Builder.class); + SignalServiceProtos.Envelope.class, SignalServiceProtos.Envelope.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -275,7 +275,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.Envelope.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -303,7 +303,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.Envelope.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type type_; + private SignalServiceProtos.Envelope.Type type_; /** * required .signalservice.Envelope.Type type = 1; * @@ -321,7 +321,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType() { + public SignalServiceProtos.Envelope.Type getType() { return type_; } @@ -441,7 +441,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; source_ = ""; sourceDevice_ = 0; timestamp_ = 0L; @@ -531,53 +531,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom(byte[] data) + public static SignalServiceProtos.Envelope parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) + public static SignalServiceProtos.Envelope parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.Envelope parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseDelimitedFrom( + public static SignalServiceProtos.Envelope parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parseFrom( + public static SignalServiceProtos.Envelope parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -586,7 +586,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope prototype) { + public static Builder newBuilder(SignalServiceProtos.Envelope prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -602,20 +602,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.EnvelopeOrBuilder { + implements SignalServiceProtos.EnvelopeOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Envelope_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Builder.class); + SignalServiceProtos.Envelope.class, SignalServiceProtos.Envelope.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.Envelope.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -635,7 +635,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; bitField0_ = (bitField0_ & ~0x00000001); source_ = ""; bitField0_ = (bitField0_ & ~0x00000002); @@ -656,23 +656,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; + return SignalServiceProtos.internal_static_signalservice_Envelope_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDefaultInstance(); + public SignalServiceProtos.Envelope getDefaultInstanceForType() { + return SignalServiceProtos.Envelope.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope result = buildPartial(); + public SignalServiceProtos.Envelope build() { + SignalServiceProtos.Envelope result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope result = new org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope(this); + public SignalServiceProtos.Envelope buildPartial() { + SignalServiceProtos.Envelope result = new SignalServiceProtos.Envelope(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -705,16 +705,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope)other); + if (other instanceof SignalServiceProtos.Envelope) { + return mergeFrom((SignalServiceProtos.Envelope)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.Envelope other) { + if (other == SignalServiceProtos.Envelope.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -755,11 +755,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope parsedMessage = null; + SignalServiceProtos.Envelope parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.Envelope) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -771,7 +771,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.Envelope.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + private SignalServiceProtos.Envelope.Type type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; /** * required .signalservice.Envelope.Type type = 1; * @@ -789,7 +789,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type getType() { + public SignalServiceProtos.Envelope.Type getType() { return type_; } /** @@ -799,7 +799,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type value) { + public Builder setType(SignalServiceProtos.Envelope.Type value) { if (value == null) { throw new NullPointerException(); } @@ -817,7 +817,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; + type_ = SignalServiceProtos.Envelope.Type.SESSION_MESSAGE; onChanged(); return this; } @@ -1095,7 +1095,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction(); + SignalServiceProtos.TypingMessage.Action getAction(); } /** * Protobuf type {@code signalservice.TypingMessage} @@ -1155,7 +1155,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action value = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.valueOf(rawValue); + SignalServiceProtos.TypingMessage.Action value = SignalServiceProtos.TypingMessage.Action.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -1178,14 +1178,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder.class); + SignalServiceProtos.TypingMessage.class, SignalServiceProtos.TypingMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1260,7 +1260,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.TypingMessage.getDescriptor().getEnumTypes().get(0); } private static final Action[] VALUES = values(); @@ -1312,7 +1312,7 @@ public final class SignalServiceProtos { // required .signalservice.TypingMessage.Action action = 2; public static final int ACTION_FIELD_NUMBER = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action action_; + private SignalServiceProtos.TypingMessage.Action action_; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1330,13 +1330,13 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction() { + public SignalServiceProtos.TypingMessage.Action getAction() { return action_; } private void initFields() { timestamp_ = 0L; - action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = SignalServiceProtos.TypingMessage.Action.STARTED; } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -1393,53 +1393,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom(byte[] data) + public static SignalServiceProtos.TypingMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.TypingMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.TypingMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseDelimitedFrom( + public static SignalServiceProtos.TypingMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parseFrom( + public static SignalServiceProtos.TypingMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -1448,7 +1448,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.TypingMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -1464,20 +1464,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder { + implements SignalServiceProtos.TypingMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_TypingMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder.class); + SignalServiceProtos.TypingMessage.class, SignalServiceProtos.TypingMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.TypingMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -1499,7 +1499,7 @@ public final class SignalServiceProtos { super.clear(); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000001); - action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = SignalServiceProtos.TypingMessage.Action.STARTED; bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -1510,23 +1510,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_TypingMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + public SignalServiceProtos.TypingMessage getDefaultInstanceForType() { + return SignalServiceProtos.TypingMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage result = buildPartial(); + public SignalServiceProtos.TypingMessage build() { + SignalServiceProtos.TypingMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage(this); + public SignalServiceProtos.TypingMessage buildPartial() { + SignalServiceProtos.TypingMessage result = new SignalServiceProtos.TypingMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1543,16 +1543,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage)other); + if (other instanceof SignalServiceProtos.TypingMessage) { + return mergeFrom((SignalServiceProtos.TypingMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.TypingMessage other) { + if (other == SignalServiceProtos.TypingMessage.getDefaultInstance()) return this; if (other.hasTimestamp()) { setTimestamp(other.getTimestamp()); } @@ -1579,11 +1579,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage parsedMessage = null; + SignalServiceProtos.TypingMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.TypingMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1644,7 +1644,7 @@ public final class SignalServiceProtos { } // required .signalservice.TypingMessage.Action action = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + private SignalServiceProtos.TypingMessage.Action action_ = SignalServiceProtos.TypingMessage.Action.STARTED; /** * required .signalservice.TypingMessage.Action action = 2; * @@ -1662,7 +1662,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action getAction() { + public SignalServiceProtos.TypingMessage.Action getAction() { return action_; } /** @@ -1672,7 +1672,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setAction(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action value) { + public Builder setAction(SignalServiceProtos.TypingMessage.Action value) { if (value == null) { throw new NullPointerException(); } @@ -1690,7 +1690,7 @@ public final class SignalServiceProtos { */ public Builder clearAction() { bitField0_ = (bitField0_ & ~0x00000002); - action_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Action.STARTED; + action_ = SignalServiceProtos.TypingMessage.Action.STARTED; onChanged(); return this; } @@ -1717,11 +1717,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage(); + SignalServiceProtos.DataMessage getDataMessage(); /** * optional .signalservice.DataMessage dataMessage = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); + SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder(); // optional .signalservice.ReceiptMessage receiptMessage = 5; /** @@ -1731,11 +1731,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage(); + SignalServiceProtos.ReceiptMessage getReceiptMessage(); /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); + SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder(); // optional .signalservice.TypingMessage typingMessage = 6; /** @@ -1745,11 +1745,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage(); + SignalServiceProtos.TypingMessage getTypingMessage(); /** * optional .signalservice.TypingMessage typingMessage = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); + SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder(); // optional .signalservice.ConfigurationMessage configurationMessage = 7; /** @@ -1759,11 +1759,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); + SignalServiceProtos.ConfigurationMessage getConfigurationMessage(); /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); + SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder(); // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; /** @@ -1773,11 +1773,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); + SignalServiceProtos.DataExtractionNotification getDataExtractionNotification(); /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); + SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder(); } /** * Protobuf type {@code signalservice.Content} @@ -1831,11 +1831,11 @@ public final class SignalServiceProtos { break; } case 10: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder subBuilder = null; + SignalServiceProtos.DataMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = dataMessage_.toBuilder(); } - dataMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PARSER, extensionRegistry); + dataMessage_ = input.readMessage(SignalServiceProtos.DataMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(dataMessage_); dataMessage_ = subBuilder.buildPartial(); @@ -1844,11 +1844,11 @@ public final class SignalServiceProtos { break; } case 42: { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; + SignalServiceProtos.ReceiptMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = receiptMessage_.toBuilder(); } - receiptMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); + receiptMessage_ = input.readMessage(SignalServiceProtos.ReceiptMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(receiptMessage_); receiptMessage_ = subBuilder.buildPartial(); @@ -1857,11 +1857,11 @@ public final class SignalServiceProtos { break; } case 50: { - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder subBuilder = null; + SignalServiceProtos.TypingMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = typingMessage_.toBuilder(); } - typingMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); + typingMessage_ = input.readMessage(SignalServiceProtos.TypingMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(typingMessage_); typingMessage_ = subBuilder.buildPartial(); @@ -1870,11 +1870,11 @@ public final class SignalServiceProtos { break; } case 58: { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; + SignalServiceProtos.ConfigurationMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = configurationMessage_.toBuilder(); } - configurationMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); + configurationMessage_ = input.readMessage(SignalServiceProtos.ConfigurationMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(configurationMessage_); configurationMessage_ = subBuilder.buildPartial(); @@ -1883,11 +1883,11 @@ public final class SignalServiceProtos { break; } case 66: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; + SignalServiceProtos.DataExtractionNotification.Builder subBuilder = null; if (((bitField0_ & 0x00000010) == 0x00000010)) { subBuilder = dataExtractionNotification_.toBuilder(); } - dataExtractionNotification_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.PARSER, extensionRegistry); + dataExtractionNotification_ = input.readMessage(SignalServiceProtos.DataExtractionNotification.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(dataExtractionNotification_); dataExtractionNotification_ = subBuilder.buildPartial(); @@ -1909,14 +1909,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Content.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Content.Builder.class); + SignalServiceProtos.Content.class, SignalServiceProtos.Content.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -1937,7 +1937,7 @@ public final class SignalServiceProtos { private int bitField0_; // optional .signalservice.DataMessage dataMessage = 1; public static final int DATAMESSAGE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage dataMessage_; + private SignalServiceProtos.DataMessage dataMessage_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -1947,19 +1947,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage() { + public SignalServiceProtos.DataMessage getDataMessage() { return dataMessage_; } /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { return dataMessage_; } // optional .signalservice.ReceiptMessage receiptMessage = 5; public static final int RECEIPTMESSAGE_FIELD_NUMBER = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage receiptMessage_; + private SignalServiceProtos.ReceiptMessage receiptMessage_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -1969,19 +1969,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public SignalServiceProtos.ReceiptMessage getReceiptMessage() { return receiptMessage_; } /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { return receiptMessage_; } // optional .signalservice.TypingMessage typingMessage = 6; public static final int TYPINGMESSAGE_FIELD_NUMBER = 6; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage typingMessage_; + private SignalServiceProtos.TypingMessage typingMessage_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -1991,19 +1991,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage() { + public SignalServiceProtos.TypingMessage getTypingMessage() { return typingMessage_; } /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { return typingMessage_; } // optional .signalservice.ConfigurationMessage configurationMessage = 7; public static final int CONFIGURATIONMESSAGE_FIELD_NUMBER = 7; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage configurationMessage_; + private SignalServiceProtos.ConfigurationMessage configurationMessage_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2013,19 +2013,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { return configurationMessage_; } /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { return configurationMessage_; } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; public static final int DATAEXTRACTIONNOTIFICATION_FIELD_NUMBER = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; + private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2035,22 +2035,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { return dataExtractionNotification_; } /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { return dataExtractionNotification_; } private void initFields() { - dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); - receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); - typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); - configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); - dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -2150,53 +2150,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom(byte[] data) + public static SignalServiceProtos.Content parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom(java.io.InputStream input) + public static SignalServiceProtos.Content parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.Content parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseDelimitedFrom( + public static SignalServiceProtos.Content parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.Content parseFrom( + public static SignalServiceProtos.Content parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -2205,7 +2205,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.Content prototype) { + public static Builder newBuilder(SignalServiceProtos.Content prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -2221,20 +2221,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ContentOrBuilder { + implements SignalServiceProtos.ContentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_Content_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.Content.class, org.session.libsignal.service.internal.push.SignalServiceProtos.Content.Builder.class); + SignalServiceProtos.Content.class, SignalServiceProtos.Content.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.Content.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.Content.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -2260,31 +2260,31 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); if (dataMessageBuilder_ == null) { - dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); } else { dataMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000001); if (receiptMessageBuilder_ == null) { - receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } else { receiptMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000002); if (typingMessageBuilder_ == null) { - typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); } else { typingMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000004); if (configurationMessageBuilder_ == null) { - configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } else { configurationMessageBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000008); if (dataExtractionNotificationBuilder_ == null) { - dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } else { dataExtractionNotificationBuilder_.clear(); } @@ -2298,23 +2298,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_Content_descriptor; + return SignalServiceProtos.internal_static_signalservice_Content_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.Content.getDefaultInstance(); + public SignalServiceProtos.Content getDefaultInstanceForType() { + return SignalServiceProtos.Content.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content result = buildPartial(); + public SignalServiceProtos.Content build() { + SignalServiceProtos.Content result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.Content buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content result = new org.session.libsignal.service.internal.push.SignalServiceProtos.Content(this); + public SignalServiceProtos.Content buildPartial() { + SignalServiceProtos.Content result = new SignalServiceProtos.Content(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2363,16 +2363,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.Content) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.Content)other); + if (other instanceof SignalServiceProtos.Content) { + return mergeFrom((SignalServiceProtos.Content)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.Content other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.Content.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.Content other) { + if (other == SignalServiceProtos.Content.getDefaultInstance()) return this; if (other.hasDataMessage()) { mergeDataMessage(other.getDataMessage()); } @@ -2430,11 +2430,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.Content parsedMessage = null; + SignalServiceProtos.Content parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.Content) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.Content) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2446,9 +2446,9 @@ public final class SignalServiceProtos { private int bitField0_; // optional .signalservice.DataMessage dataMessage = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + private SignalServiceProtos.DataMessage dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> dataMessageBuilder_; /** * optional .signalservice.DataMessage dataMessage = 1; */ @@ -2458,7 +2458,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDataMessage() { + public SignalServiceProtos.DataMessage getDataMessage() { if (dataMessageBuilder_ == null) { return dataMessage_; } else { @@ -2468,7 +2468,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public Builder setDataMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage value) { + public Builder setDataMessage(SignalServiceProtos.DataMessage value) { if (dataMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2485,7 +2485,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage dataMessage = 1; */ public Builder setDataMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder builderForValue) { + SignalServiceProtos.DataMessage.Builder builderForValue) { if (dataMessageBuilder_ == null) { dataMessage_ = builderForValue.build(); onChanged(); @@ -2498,12 +2498,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public Builder mergeDataMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage value) { + public Builder mergeDataMessage(SignalServiceProtos.DataMessage value) { if (dataMessageBuilder_ == null) { if (((bitField0_ & 0x00000001) == 0x00000001) && - dataMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance()) { + dataMessage_ != SignalServiceProtos.DataMessage.getDefaultInstance()) { dataMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.newBuilder(dataMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.newBuilder(dataMessage_).mergeFrom(value).buildPartial(); } else { dataMessage_ = value; } @@ -2519,7 +2519,7 @@ public final class SignalServiceProtos { */ public Builder clearDataMessage() { if (dataMessageBuilder_ == null) { - dataMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + dataMessage_ = SignalServiceProtos.DataMessage.getDefaultInstance(); onChanged(); } else { dataMessageBuilder_.clear(); @@ -2530,7 +2530,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { + public SignalServiceProtos.DataMessage.Builder getDataMessageBuilder() { bitField0_ |= 0x00000001; onChanged(); return getDataMessageFieldBuilder().getBuilder(); @@ -2538,7 +2538,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage dataMessage = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { + public SignalServiceProtos.DataMessageOrBuilder getDataMessageOrBuilder() { if (dataMessageBuilder_ != null) { return dataMessageBuilder_.getMessageOrBuilder(); } else { @@ -2549,11 +2549,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage dataMessage = 1; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder> + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder> getDataMessageFieldBuilder() { if (dataMessageBuilder_ == null) { dataMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder>( + SignalServiceProtos.DataMessage, SignalServiceProtos.DataMessage.Builder, SignalServiceProtos.DataMessageOrBuilder>( dataMessage_, getParentForChildren(), isClean()); @@ -2563,9 +2563,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ReceiptMessage receiptMessage = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + private SignalServiceProtos.ReceiptMessage receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> receiptMessageBuilder_; /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ @@ -2575,7 +2575,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getReceiptMessage() { + public SignalServiceProtos.ReceiptMessage getReceiptMessage() { if (receiptMessageBuilder_ == null) { return receiptMessage_; } else { @@ -2585,7 +2585,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public Builder setReceiptMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage value) { + public Builder setReceiptMessage(SignalServiceProtos.ReceiptMessage value) { if (receiptMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2602,7 +2602,7 @@ public final class SignalServiceProtos { * optional .signalservice.ReceiptMessage receiptMessage = 5; */ public Builder setReceiptMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder builderForValue) { + SignalServiceProtos.ReceiptMessage.Builder builderForValue) { if (receiptMessageBuilder_ == null) { receiptMessage_ = builderForValue.build(); onChanged(); @@ -2615,12 +2615,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public Builder mergeReceiptMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage value) { + public Builder mergeReceiptMessage(SignalServiceProtos.ReceiptMessage value) { if (receiptMessageBuilder_ == null) { if (((bitField0_ & 0x00000002) == 0x00000002) && - receiptMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { + receiptMessage_ != SignalServiceProtos.ReceiptMessage.getDefaultInstance()) { receiptMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.newBuilder(receiptMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.ReceiptMessage.newBuilder(receiptMessage_).mergeFrom(value).buildPartial(); } else { receiptMessage_ = value; } @@ -2636,7 +2636,7 @@ public final class SignalServiceProtos { */ public Builder clearReceiptMessage() { if (receiptMessageBuilder_ == null) { - receiptMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + receiptMessage_ = SignalServiceProtos.ReceiptMessage.getDefaultInstance(); onChanged(); } else { receiptMessageBuilder_.clear(); @@ -2647,7 +2647,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { + public SignalServiceProtos.ReceiptMessage.Builder getReceiptMessageBuilder() { bitField0_ |= 0x00000002; onChanged(); return getReceiptMessageFieldBuilder().getBuilder(); @@ -2655,7 +2655,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ReceiptMessage receiptMessage = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { + public SignalServiceProtos.ReceiptMessageOrBuilder getReceiptMessageOrBuilder() { if (receiptMessageBuilder_ != null) { return receiptMessageBuilder_.getMessageOrBuilder(); } else { @@ -2666,11 +2666,11 @@ public final class SignalServiceProtos { * optional .signalservice.ReceiptMessage receiptMessage = 5; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder> + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder> getReceiptMessageFieldBuilder() { if (receiptMessageBuilder_ == null) { receiptMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder>( + SignalServiceProtos.ReceiptMessage, SignalServiceProtos.ReceiptMessage.Builder, SignalServiceProtos.ReceiptMessageOrBuilder>( receiptMessage_, getParentForChildren(), isClean()); @@ -2680,9 +2680,9 @@ public final class SignalServiceProtos { } // optional .signalservice.TypingMessage typingMessage = 6; - private org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + private SignalServiceProtos.TypingMessage typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> typingMessageBuilder_; /** * optional .signalservice.TypingMessage typingMessage = 6; */ @@ -2692,7 +2692,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage getTypingMessage() { + public SignalServiceProtos.TypingMessage getTypingMessage() { if (typingMessageBuilder_ == null) { return typingMessage_; } else { @@ -2702,7 +2702,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public Builder setTypingMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage value) { + public Builder setTypingMessage(SignalServiceProtos.TypingMessage value) { if (typingMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2719,7 +2719,7 @@ public final class SignalServiceProtos { * optional .signalservice.TypingMessage typingMessage = 6; */ public Builder setTypingMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder builderForValue) { + SignalServiceProtos.TypingMessage.Builder builderForValue) { if (typingMessageBuilder_ == null) { typingMessage_ = builderForValue.build(); onChanged(); @@ -2732,12 +2732,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public Builder mergeTypingMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage value) { + public Builder mergeTypingMessage(SignalServiceProtos.TypingMessage value) { if (typingMessageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - typingMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance()) { + typingMessage_ != SignalServiceProtos.TypingMessage.getDefaultInstance()) { typingMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.newBuilder(typingMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.TypingMessage.newBuilder(typingMessage_).mergeFrom(value).buildPartial(); } else { typingMessage_ = value; } @@ -2753,7 +2753,7 @@ public final class SignalServiceProtos { */ public Builder clearTypingMessage() { if (typingMessageBuilder_ == null) { - typingMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.getDefaultInstance(); + typingMessage_ = SignalServiceProtos.TypingMessage.getDefaultInstance(); onChanged(); } else { typingMessageBuilder_.clear(); @@ -2764,7 +2764,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { + public SignalServiceProtos.TypingMessage.Builder getTypingMessageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getTypingMessageFieldBuilder().getBuilder(); @@ -2772,7 +2772,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.TypingMessage typingMessage = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { + public SignalServiceProtos.TypingMessageOrBuilder getTypingMessageOrBuilder() { if (typingMessageBuilder_ != null) { return typingMessageBuilder_.getMessageOrBuilder(); } else { @@ -2783,11 +2783,11 @@ public final class SignalServiceProtos { * optional .signalservice.TypingMessage typingMessage = 6; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder> + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder> getTypingMessageFieldBuilder() { if (typingMessageBuilder_ == null) { typingMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.TypingMessageOrBuilder>( + SignalServiceProtos.TypingMessage, SignalServiceProtos.TypingMessage.Builder, SignalServiceProtos.TypingMessageOrBuilder>( typingMessage_, getParentForChildren(), isClean()); @@ -2797,9 +2797,9 @@ public final class SignalServiceProtos { } // optional .signalservice.ConfigurationMessage configurationMessage = 7; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + private SignalServiceProtos.ConfigurationMessage configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> configurationMessageBuilder_; /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ @@ -2809,7 +2809,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { + public SignalServiceProtos.ConfigurationMessage getConfigurationMessage() { if (configurationMessageBuilder_ == null) { return configurationMessage_; } else { @@ -2819,7 +2819,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public Builder setConfigurationMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage value) { + public Builder setConfigurationMessage(SignalServiceProtos.ConfigurationMessage value) { if (configurationMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2836,7 +2836,7 @@ public final class SignalServiceProtos { * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ public Builder setConfigurationMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder builderForValue) { + SignalServiceProtos.ConfigurationMessage.Builder builderForValue) { if (configurationMessageBuilder_ == null) { configurationMessage_ = builderForValue.build(); onChanged(); @@ -2849,12 +2849,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public Builder mergeConfigurationMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage value) { + public Builder mergeConfigurationMessage(SignalServiceProtos.ConfigurationMessage value) { if (configurationMessageBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - configurationMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { + configurationMessage_ != SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) { configurationMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.newBuilder(configurationMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.ConfigurationMessage.newBuilder(configurationMessage_).mergeFrom(value).buildPartial(); } else { configurationMessage_ = value; } @@ -2870,7 +2870,7 @@ public final class SignalServiceProtos { */ public Builder clearConfigurationMessage() { if (configurationMessageBuilder_ == null) { - configurationMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + configurationMessage_ = SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); onChanged(); } else { configurationMessageBuilder_.clear(); @@ -2881,7 +2881,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { + public SignalServiceProtos.ConfigurationMessage.Builder getConfigurationMessageBuilder() { bitField0_ |= 0x00000008; onChanged(); return getConfigurationMessageFieldBuilder().getBuilder(); @@ -2889,7 +2889,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { + public SignalServiceProtos.ConfigurationMessageOrBuilder getConfigurationMessageOrBuilder() { if (configurationMessageBuilder_ != null) { return configurationMessageBuilder_.getMessageOrBuilder(); } else { @@ -2900,11 +2900,11 @@ public final class SignalServiceProtos { * optional .signalservice.ConfigurationMessage configurationMessage = 7; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder> + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder> getConfigurationMessageFieldBuilder() { if (configurationMessageBuilder_ == null) { configurationMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder>( + SignalServiceProtos.ConfigurationMessage, SignalServiceProtos.ConfigurationMessage.Builder, SignalServiceProtos.ConfigurationMessageOrBuilder>( configurationMessage_, getParentForChildren(), isClean()); @@ -2914,9 +2914,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + private SignalServiceProtos.DataExtractionNotification dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> dataExtractionNotificationBuilder_; /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ @@ -2926,7 +2926,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { + public SignalServiceProtos.DataExtractionNotification getDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { return dataExtractionNotification_; } else { @@ -2936,7 +2936,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public Builder setDataExtractionNotification(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { + public Builder setDataExtractionNotification(SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -2953,7 +2953,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ public Builder setDataExtractionNotification( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { + SignalServiceProtos.DataExtractionNotification.Builder builderForValue) { if (dataExtractionNotificationBuilder_ == null) { dataExtractionNotification_ = builderForValue.build(); onChanged(); @@ -2966,12 +2966,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public Builder mergeDataExtractionNotification(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification value) { + public Builder mergeDataExtractionNotification(SignalServiceProtos.DataExtractionNotification value) { if (dataExtractionNotificationBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - dataExtractionNotification_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { + dataExtractionNotification_ != SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) { dataExtractionNotification_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.newBuilder(dataExtractionNotification_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataExtractionNotification.newBuilder(dataExtractionNotification_).mergeFrom(value).buildPartial(); } else { dataExtractionNotification_ = value; } @@ -2987,7 +2987,7 @@ public final class SignalServiceProtos { */ public Builder clearDataExtractionNotification() { if (dataExtractionNotificationBuilder_ == null) { - dataExtractionNotification_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + dataExtractionNotification_ = SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); onChanged(); } else { dataExtractionNotificationBuilder_.clear(); @@ -2998,7 +2998,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { + public SignalServiceProtos.DataExtractionNotification.Builder getDataExtractionNotificationBuilder() { bitField0_ |= 0x00000010; onChanged(); return getDataExtractionNotificationFieldBuilder().getBuilder(); @@ -3006,7 +3006,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { + public SignalServiceProtos.DataExtractionNotificationOrBuilder getDataExtractionNotificationOrBuilder() { if (dataExtractionNotificationBuilder_ != null) { return dataExtractionNotificationBuilder_.getMessageOrBuilder(); } else { @@ -3017,11 +3017,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataExtractionNotification dataExtractionNotification = 8; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder> + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder> getDataExtractionNotificationFieldBuilder() { if (dataExtractionNotificationBuilder_ == null) { dataExtractionNotificationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder>( + SignalServiceProtos.DataExtractionNotification, SignalServiceProtos.DataExtractionNotification.Builder, SignalServiceProtos.DataExtractionNotificationOrBuilder>( dataExtractionNotification_, getParentForChildren(), isClean()); @@ -3155,14 +3155,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.class, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder.class); + SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3288,53 +3288,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom(byte[] data) + public static SignalServiceProtos.KeyPair parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) + public static SignalServiceProtos.KeyPair parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.KeyPair parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseDelimitedFrom( + public static SignalServiceProtos.KeyPair parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parseFrom( + public static SignalServiceProtos.KeyPair parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3343,7 +3343,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair prototype) { + public static Builder newBuilder(SignalServiceProtos.KeyPair prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3359,20 +3359,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder { + implements SignalServiceProtos.KeyPairOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_KeyPair_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.class, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder.class); + SignalServiceProtos.KeyPair.class, SignalServiceProtos.KeyPair.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.KeyPair.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -3405,23 +3405,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; + return SignalServiceProtos.internal_static_signalservice_KeyPair_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + public SignalServiceProtos.KeyPair getDefaultInstanceForType() { + return SignalServiceProtos.KeyPair.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair result = buildPartial(); + public SignalServiceProtos.KeyPair build() { + SignalServiceProtos.KeyPair result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair result = new org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair(this); + public SignalServiceProtos.KeyPair buildPartial() { + SignalServiceProtos.KeyPair result = new SignalServiceProtos.KeyPair(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -3438,16 +3438,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair)other); + if (other instanceof SignalServiceProtos.KeyPair) { + return mergeFrom((SignalServiceProtos.KeyPair)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.KeyPair other) { + if (other == SignalServiceProtos.KeyPair.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -3474,11 +3474,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair parsedMessage = null; + SignalServiceProtos.KeyPair parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.KeyPair) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3623,7 +3623,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType(); + SignalServiceProtos.DataExtractionNotification.Type getType(); // optional uint64 timestamp = 2; /** @@ -3688,7 +3688,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.valueOf(rawValue); + SignalServiceProtos.DataExtractionNotification.Type value = SignalServiceProtos.DataExtractionNotification.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -3716,14 +3716,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder.class); + SignalServiceProtos.DataExtractionNotification.class, SignalServiceProtos.DataExtractionNotification.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -3806,7 +3806,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.DataExtractionNotification.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -3834,7 +3834,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataExtractionNotification.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type type_; + private SignalServiceProtos.DataExtractionNotification.Type type_; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -3852,7 +3852,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType() { + public SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } @@ -3873,7 +3873,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; timestamp_ = 0L; } private byte memoizedIsInitialized = -1; @@ -3927,53 +3927,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) + public static SignalServiceProtos.DataExtractionNotification parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataExtractionNotification parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( + public static SignalServiceProtos.DataExtractionNotification parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parseFrom( + public static SignalServiceProtos.DataExtractionNotification parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -3982,7 +3982,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification prototype) { + public static Builder newBuilder(SignalServiceProtos.DataExtractionNotification prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -3998,20 +3998,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotificationOrBuilder { + implements SignalServiceProtos.DataExtractionNotificationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Builder.class); + SignalServiceProtos.DataExtractionNotification.class, SignalServiceProtos.DataExtractionNotification.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataExtractionNotification.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -4031,7 +4031,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000002); @@ -4044,23 +4044,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataExtractionNotification_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); + public SignalServiceProtos.DataExtractionNotification getDefaultInstanceForType() { + return SignalServiceProtos.DataExtractionNotification.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification result = buildPartial(); + public SignalServiceProtos.DataExtractionNotification build() { + SignalServiceProtos.DataExtractionNotification result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification(this); + public SignalServiceProtos.DataExtractionNotification buildPartial() { + SignalServiceProtos.DataExtractionNotification result = new SignalServiceProtos.DataExtractionNotification(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4077,16 +4077,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification)other); + if (other instanceof SignalServiceProtos.DataExtractionNotification) { + return mergeFrom((SignalServiceProtos.DataExtractionNotification)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataExtractionNotification other) { + if (other == SignalServiceProtos.DataExtractionNotification.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -4109,11 +4109,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification parsedMessage = null; + SignalServiceProtos.DataExtractionNotification parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataExtractionNotification) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4125,7 +4125,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataExtractionNotification.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + private SignalServiceProtos.DataExtractionNotification.Type type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; /** * required .signalservice.DataExtractionNotification.Type type = 1; * @@ -4143,7 +4143,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type getType() { + public SignalServiceProtos.DataExtractionNotification.Type getType() { return type_; } /** @@ -4153,7 +4153,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type value) { + public Builder setType(SignalServiceProtos.DataExtractionNotification.Type value) { if (value == null) { throw new NullPointerException(); } @@ -4171,7 +4171,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; + type_ = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT; onChanged(); return this; } @@ -4242,12 +4242,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - java.util.List + java.util.List getAttachmentsList(); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index); + SignalServiceProtos.AttachmentPointer getAttachments(int index); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ @@ -4255,12 +4255,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - java.util.List + java.util.List getAttachmentsOrBuilderList(); /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index); // optional .signalservice.GroupContext group = 3; @@ -4271,11 +4271,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup(); + SignalServiceProtos.GroupContext getGroup(); /** * optional .signalservice.GroupContext group = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); + SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder(); // optional uint32 flags = 4; /** @@ -4325,22 +4325,22 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote(); + SignalServiceProtos.DataMessage.Quote getQuote(); /** * optional .signalservice.DataMessage.Quote quote = 8; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder(); + SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder(); // repeated .signalservice.DataMessage.Preview preview = 10; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - java.util.List + java.util.List getPreviewList(); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index); + SignalServiceProtos.DataMessage.Preview getPreview(int index); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ @@ -4348,12 +4348,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - java.util.List + java.util.List getPreviewOrBuilderList(); /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index); // optional .signalservice.DataMessage.LokiProfile profile = 101; @@ -4364,11 +4364,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile(); + SignalServiceProtos.DataMessage.LokiProfile getProfile(); /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); + SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder(); // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; /** @@ -4378,11 +4378,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); + SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation(); /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); + SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder(); // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; /** @@ -4392,11 +4392,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage(); /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder(); // optional string syncTarget = 105; /** @@ -4471,18 +4471,18 @@ public final class SignalServiceProtos { } case 18: { if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - attachments_ = new java.util.ArrayList(); + attachments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } - attachments_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry)); break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder subBuilder = null; + SignalServiceProtos.GroupContext.Builder subBuilder = null; if (((bitField0_ & 0x00000002) == 0x00000002)) { subBuilder = group_.toBuilder(); } - group_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.PARSER, extensionRegistry); + group_ = input.readMessage(SignalServiceProtos.GroupContext.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(group_); group_ = subBuilder.buildPartial(); @@ -4511,11 +4511,11 @@ public final class SignalServiceProtos { break; } case 66: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; + SignalServiceProtos.DataMessage.Quote.Builder subBuilder = null; if (((bitField0_ & 0x00000040) == 0x00000040)) { subBuilder = quote_.toBuilder(); } - quote_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.PARSER, extensionRegistry); + quote_ = input.readMessage(SignalServiceProtos.DataMessage.Quote.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(quote_); quote_ = subBuilder.buildPartial(); @@ -4525,18 +4525,18 @@ public final class SignalServiceProtos { } case 82: { if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { - preview_ = new java.util.ArrayList(); + preview_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000100; } - preview_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); + preview_.add(input.readMessage(SignalServiceProtos.DataMessage.Preview.PARSER, extensionRegistry)); break; } case 810: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; + SignalServiceProtos.DataMessage.LokiProfile.Builder subBuilder = null; if (((bitField0_ & 0x00000080) == 0x00000080)) { subBuilder = profile_.toBuilder(); } - profile_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.PARSER, extensionRegistry); + profile_ = input.readMessage(SignalServiceProtos.DataMessage.LokiProfile.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(profile_); profile_ = subBuilder.buildPartial(); @@ -4545,11 +4545,11 @@ public final class SignalServiceProtos { break; } case 818: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; + SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder subBuilder = null; if (((bitField0_ & 0x00000100) == 0x00000100)) { subBuilder = openGroupInvitation_.toBuilder(); } - openGroupInvitation_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); + openGroupInvitation_ = input.readMessage(SignalServiceProtos.DataMessage.OpenGroupInvitation.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(openGroupInvitation_); openGroupInvitation_ = subBuilder.buildPartial(); @@ -4558,11 +4558,11 @@ public final class SignalServiceProtos { break; } case 834: { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder subBuilder = null; if (((bitField0_ & 0x00000200) == 0x00000200)) { subBuilder = closedGroupControlMessage_.toBuilder(); } - closedGroupControlMessage_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); + closedGroupControlMessage_ = input.readMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(closedGroupControlMessage_); closedGroupControlMessage_ = subBuilder.buildPartial(); @@ -4595,14 +4595,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder.class); + SignalServiceProtos.DataMessage.class, SignalServiceProtos.DataMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4668,7 +4668,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.DataMessage.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -4760,12 +4760,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - java.util.List + java.util.List getAttachmentsList(); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ @@ -4773,12 +4773,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - java.util.List + java.util.List getAttachmentsOrBuilderList(); /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index); } /** @@ -4849,10 +4849,10 @@ public final class SignalServiceProtos { } case 34: { if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - attachments_ = new java.util.ArrayList(); + attachments_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } - attachments_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.PARSER, extensionRegistry)); + attachments_.add(input.readMessage(SignalServiceProtos.DataMessage.Quote.QuotedAttachment.PARSER, extensionRegistry)); break; } } @@ -4872,14 +4872,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder.class); + SignalServiceProtos.DataMessage.Quote.class, SignalServiceProtos.DataMessage.Quote.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -4938,11 +4938,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail(); + SignalServiceProtos.AttachmentPointer getThumbnail(); /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder(); // optional uint32 flags = 4; /** @@ -5016,11 +5016,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = thumbnail_.toBuilder(); } - thumbnail_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + thumbnail_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(thumbnail_); thumbnail_ = subBuilder.buildPartial(); @@ -5047,14 +5047,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -5120,7 +5120,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -5234,7 +5234,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer thumbnail = 3; public static final int THUMBNAIL_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer thumbnail_; + private SignalServiceProtos.AttachmentPointer thumbnail_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5244,13 +5244,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail() { + public SignalServiceProtos.AttachmentPointer getThumbnail() { return thumbnail_; } /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { return thumbnail_; } @@ -5273,7 +5273,7 @@ public final class SignalServiceProtos { private void initFields() { contentType_ = ""; fileName_ = ""; - thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); flags_ = 0; } private byte memoizedIsInitialized = -1; @@ -5343,53 +5343,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( + public static SignalServiceProtos.DataMessage.Quote.QuotedAttachment parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -5398,7 +5398,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote.QuotedAttachment prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -5414,20 +5414,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { + implements SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.class, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -5453,7 +5453,7 @@ public final class SignalServiceProtos { fileName_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (thumbnailBuilder_ == null) { - thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { thumbnailBuilder_.clear(); } @@ -5469,23 +5469,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_QuotedAttachment_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment build() { + SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment(this); + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment buildPartial() { + SignalServiceProtos.DataMessage.Quote.QuotedAttachment result = new SignalServiceProtos.DataMessage.Quote.QuotedAttachment(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -5514,16 +5514,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); + if (other instanceof SignalServiceProtos.DataMessage.Quote.QuotedAttachment) { + return mergeFrom((SignalServiceProtos.DataMessage.Quote.QuotedAttachment)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote.QuotedAttachment other) { + if (other == SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()) return this; if (other.hasContentType()) { bitField0_ |= 0x00000001; contentType_ = other.contentType_; @@ -5558,11 +5558,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; + SignalServiceProtos.DataMessage.Quote.QuotedAttachment parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.Quote.QuotedAttachment) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5722,9 +5722,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer thumbnail = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> thumbnailBuilder_; /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ @@ -5734,7 +5734,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getThumbnail() { + public SignalServiceProtos.AttachmentPointer getThumbnail() { if (thumbnailBuilder_ == null) { return thumbnail_; } else { @@ -5744,7 +5744,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public Builder setThumbnail(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setThumbnail(SignalServiceProtos.AttachmentPointer value) { if (thumbnailBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5761,7 +5761,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer thumbnail = 3; */ public Builder setThumbnail( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (thumbnailBuilder_ == null) { thumbnail_ = builderForValue.build(); onChanged(); @@ -5774,12 +5774,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public Builder mergeThumbnail(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeThumbnail(SignalServiceProtos.AttachmentPointer value) { if (thumbnailBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - thumbnail_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + thumbnail_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { thumbnail_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(thumbnail_).mergeFrom(value).buildPartial(); + SignalServiceProtos.AttachmentPointer.newBuilder(thumbnail_).mergeFrom(value).buildPartial(); } else { thumbnail_ = value; } @@ -5795,7 +5795,7 @@ public final class SignalServiceProtos { */ public Builder clearThumbnail() { if (thumbnailBuilder_ == null) { - thumbnail_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + thumbnail_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { thumbnailBuilder_.clear(); @@ -5806,7 +5806,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getThumbnailBuilder() { bitField0_ |= 0x00000004; onChanged(); return getThumbnailFieldBuilder().getBuilder(); @@ -5814,7 +5814,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer thumbnail = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getThumbnailOrBuilder() { if (thumbnailBuilder_ != null) { return thumbnailBuilder_.getMessageOrBuilder(); } else { @@ -5825,11 +5825,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer thumbnail = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getThumbnailFieldBuilder() { if (thumbnailBuilder_ == null) { thumbnailBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( thumbnail_, getParentForChildren(), isClean()); @@ -6007,17 +6007,17 @@ public final class SignalServiceProtos { // repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; public static final int ATTACHMENTS_FIELD_NUMBER = 4; - private java.util.List attachments_; + private java.util.List attachments_; /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { return attachments_; } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { return attachments_; } @@ -6030,13 +6030,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } @@ -6122,53 +6122,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Quote parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.Quote parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parseFrom( + public static SignalServiceProtos.DataMessage.Quote parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -6177,7 +6177,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Quote prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -6193,20 +6193,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder { + implements SignalServiceProtos.DataMessage.QuoteOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder.class); + SignalServiceProtos.DataMessage.Quote.class, SignalServiceProtos.DataMessage.Quote.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Quote.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -6248,23 +6248,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Quote_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Quote getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote result = buildPartial(); + public SignalServiceProtos.DataMessage.Quote build() { + SignalServiceProtos.DataMessage.Quote result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote(this); + public SignalServiceProtos.DataMessage.Quote buildPartial() { + SignalServiceProtos.DataMessage.Quote result = new SignalServiceProtos.DataMessage.Quote(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -6294,16 +6294,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote)other); + if (other instanceof SignalServiceProtos.DataMessage.Quote) { + return mergeFrom((SignalServiceProtos.DataMessage.Quote)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Quote other) { + if (other == SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -6369,11 +6369,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote parsedMessage = null; + SignalServiceProtos.DataMessage.Quote parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.Quote) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -6606,22 +6606,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; - private java.util.List attachments_ = + private java.util.List attachments_ = java.util.Collections.emptyList(); private void ensureAttachmentsIsMutable() { if (!((bitField0_ & 0x00000008) == 0x00000008)) { - attachments_ = new java.util.ArrayList(attachments_); + attachments_ = new java.util.ArrayList(attachments_); bitField0_ |= 0x00000008; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> attachmentsBuilder_; + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> attachmentsBuilder_; /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { if (attachmentsBuilder_ == null) { return java.util.Collections.unmodifiableList(attachments_); } else { @@ -6641,7 +6641,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment getAttachments(int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -6652,7 +6652,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6669,7 +6669,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.set(index, builderForValue.build()); @@ -6682,7 +6682,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public Builder addAttachments(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + public Builder addAttachments(SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6699,7 +6699,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { + int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6716,7 +6716,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(builderForValue.build()); @@ -6730,7 +6730,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(index, builderForValue.build()); @@ -6744,7 +6744,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ public Builder addAllAttachments( - java.lang.Iterable values) { + java.lang.Iterable values) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); super.addAll(values, attachments_); @@ -6783,14 +6783,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder getAttachmentsOrBuilder( int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -6800,7 +6800,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { if (attachmentsBuilder_ != null) { return attachmentsBuilder_.getMessageOrBuilderList(); @@ -6811,31 +6811,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( + public SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); + index, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Quote.QuotedAttachment attachments = 4; */ - public java.util.List + public java.util.List getAttachmentsBuilderList() { return getAttachmentsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( + SignalServiceProtos.DataMessage.Quote.QuotedAttachment, SignalServiceProtos.DataMessage.Quote.QuotedAttachment.Builder, SignalServiceProtos.DataMessage.Quote.QuotedAttachmentOrBuilder>( attachments_, ((bitField0_ & 0x00000008) == 0x00000008), getParentForChildren(), @@ -6909,11 +6909,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage(); + SignalServiceProtos.AttachmentPointer getImage(); /** * optional .signalservice.AttachmentPointer image = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder(); } /** * Protobuf type {@code signalservice.DataMessage.Preview} @@ -6977,11 +6977,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = image_.toBuilder(); } - image_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + image_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(image_); image_ = subBuilder.buildPartial(); @@ -7003,14 +7003,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder.class); + SignalServiceProtos.DataMessage.Preview.class, SignalServiceProtos.DataMessage.Preview.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -7129,7 +7129,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer image = 3; public static final int IMAGE_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer image_; + private SignalServiceProtos.AttachmentPointer image_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7139,20 +7139,20 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage() { + public SignalServiceProtos.AttachmentPointer getImage() { return image_; } /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { return image_; } private void initFields() { url_ = ""; title_ = ""; - image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -7218,53 +7218,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.Preview parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Preview parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.Preview parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parseFrom( + public static SignalServiceProtos.DataMessage.Preview parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -7273,7 +7273,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.Preview prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -7289,20 +7289,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder { + implements SignalServiceProtos.DataMessage.PreviewOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder.class); + SignalServiceProtos.DataMessage.Preview.class, SignalServiceProtos.DataMessage.Preview.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.Preview.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -7328,7 +7328,7 @@ public final class SignalServiceProtos { title_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (imageBuilder_ == null) { - image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { imageBuilder_.clear(); } @@ -7342,23 +7342,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_Preview_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); + public SignalServiceProtos.DataMessage.Preview getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.Preview.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview result = buildPartial(); + public SignalServiceProtos.DataMessage.Preview build() { + SignalServiceProtos.DataMessage.Preview result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview(this); + public SignalServiceProtos.DataMessage.Preview buildPartial() { + SignalServiceProtos.DataMessage.Preview result = new SignalServiceProtos.DataMessage.Preview(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -7383,16 +7383,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview)other); + if (other instanceof SignalServiceProtos.DataMessage.Preview) { + return mergeFrom((SignalServiceProtos.DataMessage.Preview)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.Preview other) { + if (other == SignalServiceProtos.DataMessage.Preview.getDefaultInstance()) return this; if (other.hasUrl()) { bitField0_ |= 0x00000001; url_ = other.url_; @@ -7428,11 +7428,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview parsedMessage = null; + SignalServiceProtos.DataMessage.Preview parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.Preview) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -7616,9 +7616,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer image = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> imageBuilder_; /** * optional .signalservice.AttachmentPointer image = 3; */ @@ -7628,7 +7628,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getImage() { + public SignalServiceProtos.AttachmentPointer getImage() { if (imageBuilder_ == null) { return image_; } else { @@ -7638,7 +7638,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public Builder setImage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setImage(SignalServiceProtos.AttachmentPointer value) { if (imageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7655,7 +7655,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer image = 3; */ public Builder setImage( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (imageBuilder_ == null) { image_ = builderForValue.build(); onChanged(); @@ -7668,12 +7668,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public Builder mergeImage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeImage(SignalServiceProtos.AttachmentPointer value) { if (imageBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - image_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + image_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { image_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(image_).mergeFrom(value).buildPartial(); + SignalServiceProtos.AttachmentPointer.newBuilder(image_).mergeFrom(value).buildPartial(); } else { image_ = value; } @@ -7689,7 +7689,7 @@ public final class SignalServiceProtos { */ public Builder clearImage() { if (imageBuilder_ == null) { - image_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + image_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { imageBuilder_.clear(); @@ -7700,7 +7700,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getImageBuilder() { bitField0_ |= 0x00000004; onChanged(); return getImageFieldBuilder().getBuilder(); @@ -7708,7 +7708,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer image = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getImageOrBuilder() { if (imageBuilder_ != null) { return imageBuilder_.getMessageOrBuilder(); } else { @@ -7719,11 +7719,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer image = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getImageFieldBuilder() { if (imageBuilder_ == null) { imageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( image_, getParentForChildren(), isClean()); @@ -7851,14 +7851,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + SignalServiceProtos.DataMessage.LokiProfile.class, SignalServiceProtos.DataMessage.LokiProfile.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8014,53 +8014,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parseFrom( + public static SignalServiceProtos.DataMessage.LokiProfile parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8069,7 +8069,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.LokiProfile prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8085,20 +8085,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder { + implements SignalServiceProtos.DataMessage.LokiProfileOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder.class); + SignalServiceProtos.DataMessage.LokiProfile.class, SignalServiceProtos.DataMessage.LokiProfile.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8131,23 +8131,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_LokiProfile_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + public SignalServiceProtos.DataMessage.LokiProfile getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); + public SignalServiceProtos.DataMessage.LokiProfile build() { + SignalServiceProtos.DataMessage.LokiProfile result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile(this); + public SignalServiceProtos.DataMessage.LokiProfile buildPartial() { + SignalServiceProtos.DataMessage.LokiProfile result = new SignalServiceProtos.DataMessage.LokiProfile(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8164,16 +8164,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile)other); + if (other instanceof SignalServiceProtos.DataMessage.LokiProfile) { + return mergeFrom((SignalServiceProtos.DataMessage.LokiProfile)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.LokiProfile other) { + if (other == SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) return this; if (other.hasDisplayName()) { bitField0_ |= 0x00000001; displayName_ = other.displayName_; @@ -8196,11 +8196,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; + SignalServiceProtos.DataMessage.LokiProfile parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.LokiProfile) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -8502,14 +8502,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + SignalServiceProtos.DataMessage.OpenGroupInvitation.class, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -8697,53 +8697,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( + public static SignalServiceProtos.DataMessage.OpenGroupInvitation parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -8752,7 +8752,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.OpenGroupInvitation prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -8768,20 +8768,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { + implements SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); + SignalServiceProtos.DataMessage.OpenGroupInvitation.class, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -8814,23 +8814,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_OpenGroupInvitation_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + public SignalServiceProtos.DataMessage.OpenGroupInvitation getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); + public SignalServiceProtos.DataMessage.OpenGroupInvitation build() { + SignalServiceProtos.DataMessage.OpenGroupInvitation result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation(this); + public SignalServiceProtos.DataMessage.OpenGroupInvitation buildPartial() { + SignalServiceProtos.DataMessage.OpenGroupInvitation result = new SignalServiceProtos.DataMessage.OpenGroupInvitation(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -8847,16 +8847,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation)other); + if (other instanceof SignalServiceProtos.DataMessage.OpenGroupInvitation) { + return mergeFrom((SignalServiceProtos.DataMessage.OpenGroupInvitation)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.OpenGroupInvitation other) { + if (other == SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) return this; if (other.hasUrl()) { bitField0_ |= 0x00000001; url_ = other.url_; @@ -8887,11 +8887,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; + SignalServiceProtos.DataMessage.OpenGroupInvitation parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.OpenGroupInvitation) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -9128,7 +9128,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType(); // optional bytes publicKey = 2; /** @@ -9163,11 +9163,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair(); + SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); // repeated bytes members = 5; /** @@ -9201,12 +9201,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - java.util.List + java.util.List getWrappersList(); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ @@ -9214,12 +9214,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - java.util.List + java.util.List getWrappersOrBuilderList(); /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index); } /** @@ -9275,7 +9275,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -9295,11 +9295,11 @@ public final class SignalServiceProtos { break; } case 34: { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder subBuilder = null; + SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -9325,10 +9325,10 @@ public final class SignalServiceProtos { } case 58: { if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - wrappers_ = new java.util.ArrayList(); + wrappers_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } - wrappers_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); + wrappers_.add(input.readMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.PARSER, extensionRegistry)); break; } } @@ -9354,14 +9354,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9512,7 +9512,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -9651,14 +9651,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -9784,53 +9784,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -9839,7 +9839,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -9855,20 +9855,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { + implements SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -9901,23 +9901,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_KeyPairWrapper_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper build() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper buildPartial() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -9934,16 +9934,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); + if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) { + return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper other) { + if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -9970,11 +9970,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10103,7 +10103,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10121,7 +10121,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } @@ -10186,7 +10186,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 4; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 4; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_; + private SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10196,13 +10196,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -10254,17 +10254,17 @@ public final class SignalServiceProtos { // repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; public static final int WRAPPERS_FIELD_NUMBER = 7; - private java.util.List wrappers_; + private java.util.List wrappers_; /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List getWrappersList() { + public java.util.List getWrappersList() { return wrappers_; } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersOrBuilderList() { return wrappers_; } @@ -10277,22 +10277,22 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { return wrappers_.get(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { return wrappers_.get(index); } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); wrappers_ = java.util.Collections.emptyList(); @@ -10405,53 +10405,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( + public static SignalServiceProtos.DataMessage.ClosedGroupControlMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -10460,7 +10460,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage.ClosedGroupControlMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -10476,20 +10476,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { + implements SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.class, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -10511,14 +10511,14 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; bitField0_ = (bitField0_ & ~0x00000001); publicKey_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); name_ = ""; bitField0_ = (bitField0_ & ~0x00000004); if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -10542,23 +10542,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_ClosedGroupControlMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage build() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage buildPartial() { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage result = new SignalServiceProtos.DataMessage.ClosedGroupControlMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -10606,16 +10606,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); + if (other instanceof SignalServiceProtos.DataMessage.ClosedGroupControlMessage) { + return mergeFrom((SignalServiceProtos.DataMessage.ClosedGroupControlMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage.ClosedGroupControlMessage other) { + if (other == SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -10704,11 +10704,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage.ClosedGroupControlMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -10720,7 +10720,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; /** * required .signalservice.DataMessage.ClosedGroupControlMessage.Type type = 1; * @@ -10738,7 +10738,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type getType() { return type_; } /** @@ -10748,7 +10748,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { + public Builder setType(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -10766,7 +10766,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; + type_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW; onChanged(); return this; } @@ -10882,9 +10882,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 4; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ @@ -10894,7 +10894,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -10904,7 +10904,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder setEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10921,7 +10921,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ public Builder setEncryptionKeyPair( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder builderForValue) { + SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -10934,12 +10934,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public Builder mergeEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000008) == 0x00000008) && - encryptionKeyPair_ != org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -10955,7 +10955,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -10966,7 +10966,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000008; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -10974,7 +10974,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 4; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -10985,11 +10985,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 4; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder>( + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -11143,22 +11143,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; - private java.util.List wrappers_ = + private java.util.List wrappers_ = java.util.Collections.emptyList(); private void ensureWrappersIsMutable() { if (!((bitField0_ & 0x00000040) == 0x00000040)) { - wrappers_ = new java.util.ArrayList(wrappers_); + wrappers_ = new java.util.ArrayList(wrappers_); bitField0_ |= 0x00000040; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> wrappersBuilder_; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> wrappersBuilder_; /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List getWrappersList() { + public java.util.List getWrappersList() { if (wrappersBuilder_ == null) { return java.util.Collections.unmodifiableList(wrappers_); } else { @@ -11178,7 +11178,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper getWrappers(int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11189,7 +11189,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11206,7 +11206,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder setWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.set(index, builderForValue.build()); @@ -11219,7 +11219,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public Builder addWrappers(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + public Builder addWrappers(SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11236,7 +11236,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper value) { if (wrappersBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11253,7 +11253,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(builderForValue.build()); @@ -11267,7 +11267,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addWrappers( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder builderForValue) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); wrappers_.add(index, builderForValue.build()); @@ -11281,7 +11281,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ public Builder addAllWrappers( - java.lang.Iterable values) { + java.lang.Iterable values) { if (wrappersBuilder_ == null) { ensureWrappersIsMutable(); super.addAll(values, wrappers_); @@ -11320,14 +11320,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder getWrappersBuilder( int index) { return getWrappersFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder getWrappersOrBuilder( int index) { if (wrappersBuilder_ == null) { return wrappers_.get(index); } else { @@ -11337,7 +11337,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersOrBuilderList() { if (wrappersBuilder_ != null) { return wrappersBuilder_.getMessageOrBuilderList(); @@ -11348,31 +11348,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder() { return getWrappersFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder addWrappersBuilder( int index) { return getWrappersFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); + index, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.ClosedGroupControlMessage.KeyPairWrapper wrappers = 7; */ - public java.util.List + public java.util.List getWrappersBuilderList() { return getWrappersFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder> getWrappersFieldBuilder() { if (wrappersBuilder_ == null) { wrappersBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapper.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.KeyPairWrapperOrBuilder>( wrappers_, ((bitField0_ & 0x00000040) == 0x00000040), getParentForChildren(), @@ -11439,17 +11439,17 @@ public final class SignalServiceProtos { // repeated .signalservice.AttachmentPointer attachments = 2; public static final int ATTACHMENTS_FIELD_NUMBER = 2; - private java.util.List attachments_; + private java.util.List attachments_; /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { return attachments_; } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { return attachments_; } @@ -11462,20 +11462,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public SignalServiceProtos.AttachmentPointer getAttachments(int index) { return attachments_.get(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { return attachments_.get(index); } // optional .signalservice.GroupContext group = 3; public static final int GROUP_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext group_; + private SignalServiceProtos.GroupContext group_; /** * optional .signalservice.GroupContext group = 3; */ @@ -11485,13 +11485,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup() { + public SignalServiceProtos.GroupContext getGroup() { return group_; } /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { return group_; } @@ -11561,7 +11561,7 @@ public final class SignalServiceProtos { // optional .signalservice.DataMessage.Quote quote = 8; public static final int QUOTE_FIELD_NUMBER = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote quote_; + private SignalServiceProtos.DataMessage.Quote quote_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -11571,29 +11571,29 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote() { + public SignalServiceProtos.DataMessage.Quote getQuote() { return quote_; } /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { return quote_; } // repeated .signalservice.DataMessage.Preview preview = 10; public static final int PREVIEW_FIELD_NUMBER = 10; - private java.util.List preview_; + private java.util.List preview_; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List getPreviewList() { + public java.util.List getPreviewList() { return preview_; } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewOrBuilderList() { return preview_; } @@ -11606,20 +11606,20 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public SignalServiceProtos.DataMessage.Preview getPreview(int index) { return preview_.get(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index) { return preview_.get(index); } // optional .signalservice.DataMessage.LokiProfile profile = 101; public static final int PROFILE_FIELD_NUMBER = 101; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile profile_; + private SignalServiceProtos.DataMessage.LokiProfile profile_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -11629,19 +11629,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public SignalServiceProtos.DataMessage.LokiProfile getProfile() { return profile_; } /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { return profile_; } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; public static final int OPENGROUPINVITATION_FIELD_NUMBER = 102; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; + private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -11651,19 +11651,19 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { return openGroupInvitation_; } /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { return openGroupInvitation_; } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; public static final int CLOSEDGROUPCONTROLMESSAGE_FIELD_NUMBER = 104; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -11673,13 +11673,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { return closedGroupControlMessage_; } /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { return closedGroupControlMessage_; } @@ -11729,16 +11729,16 @@ public final class SignalServiceProtos { private void initFields() { body_ = ""; attachments_ = java.util.Collections.emptyList(); - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); flags_ = 0; expireTimer_ = 0; profileKey_ = com.google.protobuf.ByteString.EMPTY; timestamp_ = 0L; - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); preview_ = java.util.Collections.emptyList(); - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); syncTarget_ = ""; } private byte memoizedIsInitialized = -1; @@ -11901,53 +11901,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom(byte[] data) + public static SignalServiceProtos.DataMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.DataMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseDelimitedFrom( + public static SignalServiceProtos.DataMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parseFrom( + public static SignalServiceProtos.DataMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -11956,7 +11956,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.DataMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -11972,20 +11972,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessageOrBuilder { + implements SignalServiceProtos.DataMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_DataMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Builder.class); + SignalServiceProtos.DataMessage.class, SignalServiceProtos.DataMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.DataMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -12021,7 +12021,7 @@ public final class SignalServiceProtos { attachmentsBuilder_.clear(); } if (groupBuilder_ == null) { - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); } else { groupBuilder_.clear(); } @@ -12035,7 +12035,7 @@ public final class SignalServiceProtos { timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000040); if (quoteBuilder_ == null) { - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); } else { quoteBuilder_.clear(); } @@ -12047,19 +12047,19 @@ public final class SignalServiceProtos { previewBuilder_.clear(); } if (profileBuilder_ == null) { - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); } else { profileBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000200); if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); } else { openGroupInvitationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000400); if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); } else { closedGroupControlMessageBuilder_.clear(); } @@ -12075,23 +12075,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_DataMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance(); + public SignalServiceProtos.DataMessage getDefaultInstanceForType() { + return SignalServiceProtos.DataMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage result = buildPartial(); + public SignalServiceProtos.DataMessage build() { + SignalServiceProtos.DataMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage(this); + public SignalServiceProtos.DataMessage buildPartial() { + SignalServiceProtos.DataMessage result = new SignalServiceProtos.DataMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -12182,16 +12182,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage)other); + if (other instanceof SignalServiceProtos.DataMessage) { + return mergeFrom((SignalServiceProtos.DataMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.DataMessage other) { + if (other == SignalServiceProtos.DataMessage.getDefaultInstance()) return this; if (other.hasBody()) { bitField0_ |= 0x00000001; body_ = other.body_; @@ -12329,11 +12329,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage parsedMessage = null; + SignalServiceProtos.DataMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.DataMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -12419,22 +12419,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.AttachmentPointer attachments = 2; - private java.util.List attachments_ = + private java.util.List attachments_ = java.util.Collections.emptyList(); private void ensureAttachmentsIsMutable() { if (!((bitField0_ & 0x00000002) == 0x00000002)) { - attachments_ = new java.util.ArrayList(attachments_); + attachments_ = new java.util.ArrayList(attachments_); bitField0_ |= 0x00000002; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> attachmentsBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> attachmentsBuilder_; /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List getAttachmentsList() { + public java.util.List getAttachmentsList() { if (attachmentsBuilder_ == null) { return java.util.Collections.unmodifiableList(attachments_); } else { @@ -12454,7 +12454,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAttachments(int index) { + public SignalServiceProtos.AttachmentPointer getAttachments(int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12465,7 +12465,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + int index, SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12482,7 +12482,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder setAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.set(index, builderForValue.build()); @@ -12495,7 +12495,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public Builder addAttachments(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder addAttachments(SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12512,7 +12512,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + int index, SignalServiceProtos.AttachmentPointer value) { if (attachmentsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12529,7 +12529,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(builderForValue.build()); @@ -12543,7 +12543,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAttachments( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + int index, SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); attachments_.add(index, builderForValue.build()); @@ -12557,7 +12557,7 @@ public final class SignalServiceProtos { * repeated .signalservice.AttachmentPointer attachments = 2; */ public Builder addAllAttachments( - java.lang.Iterable values) { + java.lang.Iterable values) { if (attachmentsBuilder_ == null) { ensureAttachmentsIsMutable(); super.addAll(values, attachments_); @@ -12596,14 +12596,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( + public SignalServiceProtos.AttachmentPointer.Builder getAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( + public SignalServiceProtos.AttachmentPointerOrBuilder getAttachmentsOrBuilder( int index) { if (attachmentsBuilder_ == null) { return attachments_.get(index); } else { @@ -12613,7 +12613,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsOrBuilderList() { if (attachmentsBuilder_ != null) { return attachmentsBuilder_.getMessageOrBuilderList(); @@ -12624,31 +12624,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder() { return getAttachmentsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + SignalServiceProtos.AttachmentPointer.getDefaultInstance()); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( + public SignalServiceProtos.AttachmentPointer.Builder addAttachmentsBuilder( int index) { return getAttachmentsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()); + index, SignalServiceProtos.AttachmentPointer.getDefaultInstance()); } /** * repeated .signalservice.AttachmentPointer attachments = 2; */ - public java.util.List + public java.util.List getAttachmentsBuilderList() { return getAttachmentsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getAttachmentsFieldBuilder() { if (attachmentsBuilder_ == null) { attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( attachments_, ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), @@ -12659,9 +12659,9 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext group = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + private SignalServiceProtos.GroupContext group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> groupBuilder_; /** * optional .signalservice.GroupContext group = 3; */ @@ -12671,7 +12671,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getGroup() { + public SignalServiceProtos.GroupContext getGroup() { if (groupBuilder_ == null) { return group_; } else { @@ -12681,7 +12681,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder setGroup(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext value) { + public Builder setGroup(SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12698,7 +12698,7 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ public Builder setGroup( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder builderForValue) { + SignalServiceProtos.GroupContext.Builder builderForValue) { if (groupBuilder_ == null) { group_ = builderForValue.build(); onChanged(); @@ -12711,12 +12711,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public Builder mergeGroup(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext value) { + public Builder mergeGroup(SignalServiceProtos.GroupContext value) { if (groupBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - group_ != org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance()) { + group_ != SignalServiceProtos.GroupContext.getDefaultInstance()) { group_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); + SignalServiceProtos.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial(); } else { group_ = value; } @@ -12732,7 +12732,7 @@ public final class SignalServiceProtos { */ public Builder clearGroup() { if (groupBuilder_ == null) { - group_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + group_ = SignalServiceProtos.GroupContext.getDefaultInstance(); onChanged(); } else { groupBuilder_.clear(); @@ -12743,7 +12743,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder getGroupBuilder() { + public SignalServiceProtos.GroupContext.Builder getGroupBuilder() { bitField0_ |= 0x00000004; onChanged(); return getGroupFieldBuilder().getBuilder(); @@ -12751,7 +12751,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.GroupContext group = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { + public SignalServiceProtos.GroupContextOrBuilder getGroupOrBuilder() { if (groupBuilder_ != null) { return groupBuilder_.getMessageOrBuilder(); } else { @@ -12762,11 +12762,11 @@ public final class SignalServiceProtos { * optional .signalservice.GroupContext group = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder> + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder> getGroupFieldBuilder() { if (groupBuilder_ == null) { groupBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder>( + SignalServiceProtos.GroupContext, SignalServiceProtos.GroupContext.Builder, SignalServiceProtos.GroupContextOrBuilder>( group_, getParentForChildren(), isClean()); @@ -12911,9 +12911,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.Quote quote = 8; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + private SignalServiceProtos.DataMessage.Quote quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> quoteBuilder_; /** * optional .signalservice.DataMessage.Quote quote = 8; */ @@ -12923,7 +12923,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote getQuote() { + public SignalServiceProtos.DataMessage.Quote getQuote() { if (quoteBuilder_ == null) { return quote_; } else { @@ -12933,7 +12933,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder setQuote(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote value) { + public Builder setQuote(SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -12950,7 +12950,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ public Builder setQuote( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { + SignalServiceProtos.DataMessage.Quote.Builder builderForValue) { if (quoteBuilder_ == null) { quote_ = builderForValue.build(); onChanged(); @@ -12963,12 +12963,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public Builder mergeQuote(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote value) { + public Builder mergeQuote(SignalServiceProtos.DataMessage.Quote value) { if (quoteBuilder_ == null) { if (((bitField0_ & 0x00000080) == 0x00000080) && - quote_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { + quote_ != SignalServiceProtos.DataMessage.Quote.getDefaultInstance()) { quote_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.Quote.newBuilder(quote_).mergeFrom(value).buildPartial(); } else { quote_ = value; } @@ -12984,7 +12984,7 @@ public final class SignalServiceProtos { */ public Builder clearQuote() { if (quoteBuilder_ == null) { - quote_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); + quote_ = SignalServiceProtos.DataMessage.Quote.getDefaultInstance(); onChanged(); } else { quoteBuilder_.clear(); @@ -12995,7 +12995,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { + public SignalServiceProtos.DataMessage.Quote.Builder getQuoteBuilder() { bitField0_ |= 0x00000080; onChanged(); return getQuoteFieldBuilder().getBuilder(); @@ -13003,7 +13003,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.Quote quote = 8; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { + public SignalServiceProtos.DataMessage.QuoteOrBuilder getQuoteOrBuilder() { if (quoteBuilder_ != null) { return quoteBuilder_.getMessageOrBuilder(); } else { @@ -13014,11 +13014,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.Quote quote = 8; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder> + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder> getQuoteFieldBuilder() { if (quoteBuilder_ == null) { quoteBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Quote.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.QuoteOrBuilder>( + SignalServiceProtos.DataMessage.Quote, SignalServiceProtos.DataMessage.Quote.Builder, SignalServiceProtos.DataMessage.QuoteOrBuilder>( quote_, getParentForChildren(), isClean()); @@ -13028,22 +13028,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.DataMessage.Preview preview = 10; - private java.util.List preview_ = + private java.util.List preview_ = java.util.Collections.emptyList(); private void ensurePreviewIsMutable() { if (!((bitField0_ & 0x00000100) == 0x00000100)) { - preview_ = new java.util.ArrayList(preview_); + preview_ = new java.util.ArrayList(preview_); bitField0_ |= 0x00000100; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder> previewBuilder_; + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder> previewBuilder_; /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List getPreviewList() { + public java.util.List getPreviewList() { if (previewBuilder_ == null) { return java.util.Collections.unmodifiableList(preview_); } else { @@ -13063,7 +13063,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview getPreview(int index) { + public SignalServiceProtos.DataMessage.Preview getPreview(int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13074,7 +13074,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + int index, SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13091,7 +13091,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder setPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.set(index, builderForValue.build()); @@ -13104,7 +13104,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public Builder addPreview(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + public Builder addPreview(SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13121,7 +13121,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview value) { + int index, SignalServiceProtos.DataMessage.Preview value) { if (previewBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13138,7 +13138,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(builderForValue.build()); @@ -13152,7 +13152,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addPreview( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { + int index, SignalServiceProtos.DataMessage.Preview.Builder builderForValue) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); preview_.add(index, builderForValue.build()); @@ -13166,7 +13166,7 @@ public final class SignalServiceProtos { * repeated .signalservice.DataMessage.Preview preview = 10; */ public Builder addAllPreview( - java.lang.Iterable values) { + java.lang.Iterable values) { if (previewBuilder_ == null) { ensurePreviewIsMutable(); super.addAll(values, preview_); @@ -13205,14 +13205,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( + public SignalServiceProtos.DataMessage.Preview.Builder getPreviewBuilder( int index) { return getPreviewFieldBuilder().getBuilder(index); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( + public SignalServiceProtos.DataMessage.PreviewOrBuilder getPreviewOrBuilder( int index) { if (previewBuilder_ == null) { return preview_.get(index); } else { @@ -13222,7 +13222,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewOrBuilderList() { if (previewBuilder_ != null) { return previewBuilder_.getMessageOrBuilderList(); @@ -13233,31 +13233,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { + public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder() { return getPreviewFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( + public SignalServiceProtos.DataMessage.Preview.Builder addPreviewBuilder( int index) { return getPreviewFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); + index, SignalServiceProtos.DataMessage.Preview.getDefaultInstance()); } /** * repeated .signalservice.DataMessage.Preview preview = 10; */ - public java.util.List + public java.util.List getPreviewBuilderList() { return getPreviewFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder> + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder> getPreviewFieldBuilder() { if (previewBuilder_ == null) { previewBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.Preview.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.PreviewOrBuilder>( + SignalServiceProtos.DataMessage.Preview, SignalServiceProtos.DataMessage.Preview.Builder, SignalServiceProtos.DataMessage.PreviewOrBuilder>( preview_, ((bitField0_ & 0x00000100) == 0x00000100), getParentForChildren(), @@ -13268,9 +13268,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.LokiProfile profile = 101; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + private SignalServiceProtos.DataMessage.LokiProfile profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> profileBuilder_; /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ @@ -13280,7 +13280,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile getProfile() { + public SignalServiceProtos.DataMessage.LokiProfile getProfile() { if (profileBuilder_ == null) { return profile_; } else { @@ -13290,7 +13290,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder setProfile(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder setProfile(SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13307,7 +13307,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ public Builder setProfile( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { + SignalServiceProtos.DataMessage.LokiProfile.Builder builderForValue) { if (profileBuilder_ == null) { profile_ = builderForValue.build(); onChanged(); @@ -13320,12 +13320,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public Builder mergeProfile(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile value) { + public Builder mergeProfile(SignalServiceProtos.DataMessage.LokiProfile value) { if (profileBuilder_ == null) { if (((bitField0_ & 0x00000200) == 0x00000200) && - profile_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { + profile_ != SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance()) { profile_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.LokiProfile.newBuilder(profile_).mergeFrom(value).buildPartial(); } else { profile_ = value; } @@ -13341,7 +13341,7 @@ public final class SignalServiceProtos { */ public Builder clearProfile() { if (profileBuilder_ == null) { - profile_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); + profile_ = SignalServiceProtos.DataMessage.LokiProfile.getDefaultInstance(); onChanged(); } else { profileBuilder_.clear(); @@ -13352,7 +13352,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { + public SignalServiceProtos.DataMessage.LokiProfile.Builder getProfileBuilder() { bitField0_ |= 0x00000200; onChanged(); return getProfileFieldBuilder().getBuilder(); @@ -13360,7 +13360,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.LokiProfile profile = 101; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { + public SignalServiceProtos.DataMessage.LokiProfileOrBuilder getProfileOrBuilder() { if (profileBuilder_ != null) { return profileBuilder_.getMessageOrBuilder(); } else { @@ -13371,11 +13371,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.LokiProfile profile = 101; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder> + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder> getProfileFieldBuilder() { if (profileBuilder_ == null) { profileBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfile.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( + SignalServiceProtos.DataMessage.LokiProfile, SignalServiceProtos.DataMessage.LokiProfile.Builder, SignalServiceProtos.DataMessage.LokiProfileOrBuilder>( profile_, getParentForChildren(), isClean()); @@ -13385,9 +13385,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + private SignalServiceProtos.DataMessage.OpenGroupInvitation openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> openGroupInvitationBuilder_; /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ @@ -13397,7 +13397,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation getOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { return openGroupInvitation_; } else { @@ -13407,7 +13407,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder setOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder setOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13424,7 +13424,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ public Builder setOpenGroupInvitation( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { + SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder builderForValue) { if (openGroupInvitationBuilder_ == null) { openGroupInvitation_ = builderForValue.build(); onChanged(); @@ -13437,12 +13437,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public Builder mergeOpenGroupInvitation(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation value) { + public Builder mergeOpenGroupInvitation(SignalServiceProtos.DataMessage.OpenGroupInvitation value) { if (openGroupInvitationBuilder_ == null) { if (((bitField0_ & 0x00000400) == 0x00000400) && - openGroupInvitation_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { + openGroupInvitation_ != SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance()) { openGroupInvitation_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.OpenGroupInvitation.newBuilder(openGroupInvitation_).mergeFrom(value).buildPartial(); } else { openGroupInvitation_ = value; } @@ -13458,7 +13458,7 @@ public final class SignalServiceProtos { */ public Builder clearOpenGroupInvitation() { if (openGroupInvitationBuilder_ == null) { - openGroupInvitation_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); + openGroupInvitation_ = SignalServiceProtos.DataMessage.OpenGroupInvitation.getDefaultInstance(); onChanged(); } else { openGroupInvitationBuilder_.clear(); @@ -13469,7 +13469,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder getOpenGroupInvitationBuilder() { bitField0_ |= 0x00000400; onChanged(); return getOpenGroupInvitationFieldBuilder().getBuilder(); @@ -13477,7 +13477,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { + public SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder getOpenGroupInvitationOrBuilder() { if (openGroupInvitationBuilder_ != null) { return openGroupInvitationBuilder_.getMessageOrBuilder(); } else { @@ -13488,11 +13488,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.OpenGroupInvitation openGroupInvitation = 102; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder> getOpenGroupInvitationFieldBuilder() { if (openGroupInvitationBuilder_ == null) { openGroupInvitationBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( + SignalServiceProtos.DataMessage.OpenGroupInvitation, SignalServiceProtos.DataMessage.OpenGroupInvitation.Builder, SignalServiceProtos.DataMessage.OpenGroupInvitationOrBuilder>( openGroupInvitation_, getParentForChildren(), isClean()); @@ -13502,9 +13502,9 @@ public final class SignalServiceProtos { } // optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; - private org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + private SignalServiceProtos.DataMessage.ClosedGroupControlMessage closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> closedGroupControlMessageBuilder_; /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ @@ -13514,7 +13514,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage getClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { return closedGroupControlMessage_; } else { @@ -13524,7 +13524,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder setClosedGroupControlMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder setClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13541,7 +13541,7 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ public Builder setClosedGroupControlMessage( - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder builderForValue) { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessage_ = builderForValue.build(); onChanged(); @@ -13554,12 +13554,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public Builder mergeClosedGroupControlMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { + public Builder mergeClosedGroupControlMessage(SignalServiceProtos.DataMessage.ClosedGroupControlMessage value) { if (closedGroupControlMessageBuilder_ == null) { if (((bitField0_ & 0x00000800) == 0x00000800) && - closedGroupControlMessage_ != org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { + closedGroupControlMessage_ != SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance()) { closedGroupControlMessage_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); + SignalServiceProtos.DataMessage.ClosedGroupControlMessage.newBuilder(closedGroupControlMessage_).mergeFrom(value).buildPartial(); } else { closedGroupControlMessage_ = value; } @@ -13575,7 +13575,7 @@ public final class SignalServiceProtos { */ public Builder clearClosedGroupControlMessage() { if (closedGroupControlMessageBuilder_ == null) { - closedGroupControlMessage_ = org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); + closedGroupControlMessage_ = SignalServiceProtos.DataMessage.ClosedGroupControlMessage.getDefaultInstance(); onChanged(); } else { closedGroupControlMessageBuilder_.clear(); @@ -13586,7 +13586,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder getClosedGroupControlMessageBuilder() { bitField0_ |= 0x00000800; onChanged(); return getClosedGroupControlMessageFieldBuilder().getBuilder(); @@ -13594,7 +13594,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { + public SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder getClosedGroupControlMessageOrBuilder() { if (closedGroupControlMessageBuilder_ != null) { return closedGroupControlMessageBuilder_.getMessageOrBuilder(); } else { @@ -13605,11 +13605,11 @@ public final class SignalServiceProtos { * optional .signalservice.DataMessage.ClosedGroupControlMessage closedGroupControlMessage = 104; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder> getClosedGroupControlMessageFieldBuilder() { if (closedGroupControlMessageBuilder_ == null) { closedGroupControlMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( + SignalServiceProtos.DataMessage.ClosedGroupControlMessage, SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Builder, SignalServiceProtos.DataMessage.ClosedGroupControlMessageOrBuilder>( closedGroupControlMessage_, getParentForChildren(), isClean()); @@ -13710,12 +13710,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); + SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ @@ -13723,12 +13723,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - java.util.List + java.util.List getClosedGroupsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index); // repeated string openGroups = 2; @@ -13795,12 +13795,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); + SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ @@ -13808,12 +13808,12 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - java.util.List + java.util.List getContactsOrBuilderList(); /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index); } /** @@ -13869,10 +13869,10 @@ public final class SignalServiceProtos { } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - closedGroups_ = new java.util.ArrayList(); + closedGroups_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } - closedGroups_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); + closedGroups_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.ClosedGroup.PARSER, extensionRegistry)); break; } case 18: { @@ -13900,10 +13900,10 @@ public final class SignalServiceProtos { } case 50: { if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - contacts_ = new java.util.ArrayList(); + contacts_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } - contacts_.add(input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); + contacts_.add(input.readMessage(SignalServiceProtos.ConfigurationMessage.Contact.PARSER, extensionRegistry)); break; } } @@ -13929,14 +13929,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder.class); + SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -13990,11 +13990,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair(); + SignalServiceProtos.KeyPair getEncryptionKeyPair(); /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); + SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder(); // repeated bytes members = 4; /** @@ -14086,11 +14086,11 @@ public final class SignalServiceProtos { break; } case 26: { - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder subBuilder = null; + SignalServiceProtos.KeyPair.Builder subBuilder = null; if (((bitField0_ & 0x00000004) == 0x00000004)) { subBuilder = encryptionKeyPair_.toBuilder(); } - encryptionKeyPair_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.PARSER, extensionRegistry); + encryptionKeyPair_ = input.readMessage(SignalServiceProtos.KeyPair.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(encryptionKeyPair_); encryptionKeyPair_ = subBuilder.buildPartial(); @@ -14134,14 +14134,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -14221,7 +14221,7 @@ public final class SignalServiceProtos { // optional .signalservice.KeyPair encryptionKeyPair = 3; public static final int ENCRYPTIONKEYPAIR_FIELD_NUMBER = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_; + private SignalServiceProtos.KeyPair encryptionKeyPair_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14231,13 +14231,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { return encryptionKeyPair_; } /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { return encryptionKeyPair_; } @@ -14290,7 +14290,7 @@ public final class SignalServiceProtos { private void initFields() { publicKey_ = com.google.protobuf.ByteString.EMPTY; name_ = ""; - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); members_ = java.util.Collections.emptyList(); admins_ = java.util.Collections.emptyList(); } @@ -14378,53 +14378,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( + public static SignalServiceProtos.ConfigurationMessage.ClosedGroup parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -14433,7 +14433,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.ClosedGroup prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -14449,20 +14449,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { + implements SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.class, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.ClosedGroup.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -14488,7 +14488,7 @@ public final class SignalServiceProtos { name_ = ""; bitField0_ = (bitField0_ & ~0x00000002); if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); } else { encryptionKeyPairBuilder_.clear(); } @@ -14506,23 +14506,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup build() { + SignalServiceProtos.ConfigurationMessage.ClosedGroup result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); + public SignalServiceProtos.ConfigurationMessage.ClosedGroup buildPartial() { + SignalServiceProtos.ConfigurationMessage.ClosedGroup result = new SignalServiceProtos.ConfigurationMessage.ClosedGroup(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -14557,16 +14557,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage.ClosedGroup) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage.ClosedGroup)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.ClosedGroup other) { + if (other == SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -14616,11 +14616,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; + SignalServiceProtos.ConfigurationMessage.ClosedGroup parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage.ClosedGroup) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -14742,9 +14742,9 @@ public final class SignalServiceProtos { } // optional .signalservice.KeyPair encryptionKeyPair = 3; - private org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + private SignalServiceProtos.KeyPair encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> encryptionKeyPairBuilder_; /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ @@ -14754,7 +14754,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair getEncryptionKeyPair() { + public SignalServiceProtos.KeyPair getEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { return encryptionKeyPair_; } else { @@ -14764,7 +14764,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder setEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder setEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -14781,7 +14781,7 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ public Builder setEncryptionKeyPair( - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder builderForValue) { + SignalServiceProtos.KeyPair.Builder builderForValue) { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPair_ = builderForValue.build(); onChanged(); @@ -14794,12 +14794,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public Builder mergeEncryptionKeyPair(org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair value) { + public Builder mergeEncryptionKeyPair(SignalServiceProtos.KeyPair value) { if (encryptionKeyPairBuilder_ == null) { if (((bitField0_ & 0x00000004) == 0x00000004) && - encryptionKeyPair_ != org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance()) { + encryptionKeyPair_ != SignalServiceProtos.KeyPair.getDefaultInstance()) { encryptionKeyPair_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); + SignalServiceProtos.KeyPair.newBuilder(encryptionKeyPair_).mergeFrom(value).buildPartial(); } else { encryptionKeyPair_ = value; } @@ -14815,7 +14815,7 @@ public final class SignalServiceProtos { */ public Builder clearEncryptionKeyPair() { if (encryptionKeyPairBuilder_ == null) { - encryptionKeyPair_ = org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.getDefaultInstance(); + encryptionKeyPair_ = SignalServiceProtos.KeyPair.getDefaultInstance(); onChanged(); } else { encryptionKeyPairBuilder_.clear(); @@ -14826,7 +14826,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { + public SignalServiceProtos.KeyPair.Builder getEncryptionKeyPairBuilder() { bitField0_ |= 0x00000004; onChanged(); return getEncryptionKeyPairFieldBuilder().getBuilder(); @@ -14834,7 +14834,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.KeyPair encryptionKeyPair = 3; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { + public SignalServiceProtos.KeyPairOrBuilder getEncryptionKeyPairOrBuilder() { if (encryptionKeyPairBuilder_ != null) { return encryptionKeyPairBuilder_.getMessageOrBuilder(); } else { @@ -14845,11 +14845,11 @@ public final class SignalServiceProtos { * optional .signalservice.KeyPair encryptionKeyPair = 3; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder> + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder> getEncryptionKeyPairFieldBuilder() { if (encryptionKeyPairBuilder_ == null) { encryptionKeyPairBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPair.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.KeyPairOrBuilder>( + SignalServiceProtos.KeyPair, SignalServiceProtos.KeyPair.Builder, SignalServiceProtos.KeyPairOrBuilder>( encryptionKeyPair_, getParentForChildren(), isClean()); @@ -15171,14 +15171,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -15410,53 +15410,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parseFrom( + public static SignalServiceProtos.ConfigurationMessage.Contact parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -15465,7 +15465,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage.Contact prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -15481,20 +15481,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { + implements SignalServiceProtos.ConfigurationMessage.ContactOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); + SignalServiceProtos.ConfigurationMessage.Contact.class, SignalServiceProtos.ConfigurationMessage.Contact.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.Contact.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -15531,23 +15531,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_Contact_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage.Contact getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage.Contact build() { + SignalServiceProtos.ConfigurationMessage.Contact result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact(this); + public SignalServiceProtos.ConfigurationMessage.Contact buildPartial() { + SignalServiceProtos.ConfigurationMessage.Contact result = new SignalServiceProtos.ConfigurationMessage.Contact(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -15572,16 +15572,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage.Contact) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage.Contact)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage.Contact other) { + if (other == SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()) return this; if (other.hasPublicKey()) { setPublicKey(other.getPublicKey()); } @@ -15618,11 +15618,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; + SignalServiceProtos.ConfigurationMessage.Contact parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage.Contact) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -15907,17 +15907,17 @@ public final class SignalServiceProtos { private int bitField0_; // repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; public static final int CLOSEDGROUPS_FIELD_NUMBER = 1; - private java.util.List closedGroups_; + private java.util.List closedGroups_; /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List getClosedGroupsList() { + public java.util.List getClosedGroupsList() { return closedGroups_; } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsOrBuilderList() { return closedGroups_; } @@ -15930,13 +15930,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { return closedGroups_.get(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { return closedGroups_.get(index); } @@ -16075,17 +16075,17 @@ public final class SignalServiceProtos { // repeated .signalservice.ConfigurationMessage.Contact contacts = 6; public static final int CONTACTS_FIELD_NUMBER = 6; - private java.util.List contacts_; + private java.util.List contacts_; /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List getContactsList() { + public java.util.List getContactsList() { return contacts_; } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsOrBuilderList() { return contacts_; } @@ -16098,13 +16098,13 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { return contacts_.get(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { return contacts_.get(index); } @@ -16209,53 +16209,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) + public static SignalServiceProtos.ConfigurationMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( + public static SignalServiceProtos.ConfigurationMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parseFrom( + public static SignalServiceProtos.ConfigurationMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -16264,7 +16264,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.ConfigurationMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -16280,20 +16280,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessageOrBuilder { + implements SignalServiceProtos.ConfigurationMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Builder.class); + SignalServiceProtos.ConfigurationMessage.class, SignalServiceProtos.ConfigurationMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ConfigurationMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -16344,23 +16344,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ConfigurationMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); + public SignalServiceProtos.ConfigurationMessage getDefaultInstanceForType() { + return SignalServiceProtos.ConfigurationMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage result = buildPartial(); + public SignalServiceProtos.ConfigurationMessage build() { + SignalServiceProtos.ConfigurationMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage(this); + public SignalServiceProtos.ConfigurationMessage buildPartial() { + SignalServiceProtos.ConfigurationMessage result = new SignalServiceProtos.ConfigurationMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (closedGroupsBuilder_ == null) { @@ -16405,16 +16405,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage)other); + if (other instanceof SignalServiceProtos.ConfigurationMessage) { + return mergeFrom((SignalServiceProtos.ConfigurationMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ConfigurationMessage other) { + if (other == SignalServiceProtos.ConfigurationMessage.getDefaultInstance()) return this; if (closedGroupsBuilder_ == null) { if (!other.closedGroups_.isEmpty()) { if (closedGroups_.isEmpty()) { @@ -16514,11 +16514,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage parsedMessage = null; + SignalServiceProtos.ConfigurationMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ConfigurationMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -16530,22 +16530,22 @@ public final class SignalServiceProtos { private int bitField0_; // repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; - private java.util.List closedGroups_ = + private java.util.List closedGroups_ = java.util.Collections.emptyList(); private void ensureClosedGroupsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - closedGroups_ = new java.util.ArrayList(closedGroups_); + closedGroups_ = new java.util.ArrayList(closedGroups_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> closedGroupsBuilder_; + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> closedGroupsBuilder_; /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List getClosedGroupsList() { + public java.util.List getClosedGroupsList() { if (closedGroupsBuilder_ == null) { return java.util.Collections.unmodifiableList(closedGroups_); } else { @@ -16565,7 +16565,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup getClosedGroups(int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16576,7 +16576,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16593,7 +16593,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder setClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.set(index, builderForValue.build()); @@ -16606,7 +16606,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public Builder addClosedGroups(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + public Builder addClosedGroups(SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16623,7 +16623,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup value) { if (closedGroupsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -16640,7 +16640,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(builderForValue.build()); @@ -16654,7 +16654,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addClosedGroups( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder builderForValue) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); closedGroups_.add(index, builderForValue.build()); @@ -16668,7 +16668,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ public Builder addAllClosedGroups( - java.lang.Iterable values) { + java.lang.Iterable values) { if (closedGroupsBuilder_ == null) { ensureClosedGroupsIsMutable(); super.addAll(values, closedGroups_); @@ -16707,14 +16707,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder getClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder getClosedGroupsOrBuilder( int index) { if (closedGroupsBuilder_ == null) { return closedGroups_.get(index); } else { @@ -16724,7 +16724,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsOrBuilderList() { if (closedGroupsBuilder_ != null) { return closedGroupsBuilder_.getMessageOrBuilderList(); @@ -16735,31 +16735,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder() { return getClosedGroupsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( + public SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder addClosedGroupsBuilder( int index) { return getClosedGroupsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); + index, SignalServiceProtos.ConfigurationMessage.ClosedGroup.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1; */ - public java.util.List + public java.util.List getClosedGroupsBuilderList() { return getClosedGroupsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder> getClosedGroupsFieldBuilder() { if (closedGroupsBuilder_ == null) { closedGroupsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( + SignalServiceProtos.ConfigurationMessage.ClosedGroup, SignalServiceProtos.ConfigurationMessage.ClosedGroup.Builder, SignalServiceProtos.ConfigurationMessage.ClosedGroupOrBuilder>( closedGroups_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -17047,22 +17047,22 @@ public final class SignalServiceProtos { } // repeated .signalservice.ConfigurationMessage.Contact contacts = 6; - private java.util.List contacts_ = + private java.util.List contacts_ = java.util.Collections.emptyList(); private void ensureContactsIsMutable() { if (!((bitField0_ & 0x00000020) == 0x00000020)) { - contacts_ = new java.util.ArrayList(contacts_); + contacts_ = new java.util.ArrayList(contacts_); bitField0_ |= 0x00000020; } } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> contactsBuilder_; + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> contactsBuilder_; /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List getContactsList() { + public java.util.List getContactsList() { if (contactsBuilder_ == null) { return java.util.Collections.unmodifiableList(contacts_); } else { @@ -17082,7 +17082,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { + public SignalServiceProtos.ConfigurationMessage.Contact getContacts(int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17093,7 +17093,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17110,7 +17110,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder setContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.set(index, builderForValue.build()); @@ -17123,7 +17123,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public Builder addContacts(org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + public Builder addContacts(SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17140,7 +17140,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact value) { + int index, SignalServiceProtos.ConfigurationMessage.Contact value) { if (contactsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -17157,7 +17157,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(builderForValue.build()); @@ -17171,7 +17171,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addContacts( - int index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { + int index, SignalServiceProtos.ConfigurationMessage.Contact.Builder builderForValue) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); contacts_.add(index, builderForValue.build()); @@ -17185,7 +17185,7 @@ public final class SignalServiceProtos { * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ public Builder addAllContacts( - java.lang.Iterable values) { + java.lang.Iterable values) { if (contactsBuilder_ == null) { ensureContactsIsMutable(); super.addAll(values, contacts_); @@ -17224,14 +17224,14 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( + public SignalServiceProtos.ConfigurationMessage.Contact.Builder getContactsBuilder( int index) { return getContactsFieldBuilder().getBuilder(index); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( + public SignalServiceProtos.ConfigurationMessage.ContactOrBuilder getContactsOrBuilder( int index) { if (contactsBuilder_ == null) { return contacts_.get(index); } else { @@ -17241,7 +17241,7 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsOrBuilderList() { if (contactsBuilder_ != null) { return contactsBuilder_.getMessageOrBuilderList(); @@ -17252,31 +17252,31 @@ public final class SignalServiceProtos { /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { + public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder() { return getContactsFieldBuilder().addBuilder( - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( + public SignalServiceProtos.ConfigurationMessage.Contact.Builder addContactsBuilder( int index) { return getContactsFieldBuilder().addBuilder( - index, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); + index, SignalServiceProtos.ConfigurationMessage.Contact.getDefaultInstance()); } /** * repeated .signalservice.ConfigurationMessage.Contact contacts = 6; */ - public java.util.List + public java.util.List getContactsBuilderList() { return getContactsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder> getContactsFieldBuilder() { if (contactsBuilder_ == null) { contactsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.Contact.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( + SignalServiceProtos.ConfigurationMessage.Contact, SignalServiceProtos.ConfigurationMessage.Contact.Builder, SignalServiceProtos.ConfigurationMessage.ContactOrBuilder>( contacts_, ((bitField0_ & 0x00000020) == 0x00000020), getParentForChildren(), @@ -17316,7 +17316,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType(); + SignalServiceProtos.ReceiptMessage.Type getType(); // repeated uint64 timestamp = 2; /** @@ -17385,7 +17385,7 @@ public final class SignalServiceProtos { } case 8: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); + SignalServiceProtos.ReceiptMessage.Type value = SignalServiceProtos.ReceiptMessage.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(1, rawValue); } else { @@ -17432,14 +17432,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder.class); + SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -17514,7 +17514,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.ReceiptMessage.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -17542,7 +17542,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; public static final int TYPE_FIELD_NUMBER = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type type_; + private SignalServiceProtos.ReceiptMessage.Type type_; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17560,7 +17560,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType() { + public SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } @@ -17588,7 +17588,7 @@ public final class SignalServiceProtos { } private void initFields() { - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; timestamp_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; @@ -17647,53 +17647,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) + public static SignalServiceProtos.ReceiptMessage parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) + public static SignalServiceProtos.ReceiptMessage parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseDelimitedFrom( + public static SignalServiceProtos.ReceiptMessage parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parseFrom( + public static SignalServiceProtos.ReceiptMessage parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -17702,7 +17702,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage prototype) { + public static Builder newBuilder(SignalServiceProtos.ReceiptMessage prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -17718,20 +17718,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessageOrBuilder { + implements SignalServiceProtos.ReceiptMessageOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.class, org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Builder.class); + SignalServiceProtos.ReceiptMessage.class, SignalServiceProtos.ReceiptMessage.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.ReceiptMessage.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -17751,7 +17751,7 @@ public final class SignalServiceProtos { public Builder clear() { super.clear(); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00000002); @@ -17764,23 +17764,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; + return SignalServiceProtos.internal_static_signalservice_ReceiptMessage_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance(); + public SignalServiceProtos.ReceiptMessage getDefaultInstanceForType() { + return SignalServiceProtos.ReceiptMessage.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage result = buildPartial(); + public SignalServiceProtos.ReceiptMessage build() { + SignalServiceProtos.ReceiptMessage result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage(this); + public SignalServiceProtos.ReceiptMessage buildPartial() { + SignalServiceProtos.ReceiptMessage result = new SignalServiceProtos.ReceiptMessage(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -17798,16 +17798,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage)other); + if (other instanceof SignalServiceProtos.ReceiptMessage) { + return mergeFrom((SignalServiceProtos.ReceiptMessage)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.ReceiptMessage other) { + if (other == SignalServiceProtos.ReceiptMessage.getDefaultInstance()) return this; if (other.hasType()) { setType(other.getType()); } @@ -17837,11 +17837,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage parsedMessage = null; + SignalServiceProtos.ReceiptMessage parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.ReceiptMessage) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -17853,7 +17853,7 @@ public final class SignalServiceProtos { private int bitField0_; // required .signalservice.ReceiptMessage.Type type = 1; - private org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + private SignalServiceProtos.ReceiptMessage.Type type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; /** * required .signalservice.ReceiptMessage.Type type = 1; * @@ -17871,7 +17871,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type getType() { + public SignalServiceProtos.ReceiptMessage.Type getType() { return type_; } /** @@ -17881,7 +17881,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type value) { + public Builder setType(SignalServiceProtos.ReceiptMessage.Type value) { if (value == null) { throw new NullPointerException(); } @@ -17899,7 +17899,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.ReceiptMessage.Type.DELIVERY; + type_ = SignalServiceProtos.ReceiptMessage.Type.DELIVERY; onChanged(); return this; } @@ -18257,14 +18257,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder.class); + SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -18330,7 +18330,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.AttachmentPointer.getDescriptor().getEnumTypes().get(0); } private static final Flags[] VALUES = values(); @@ -18799,53 +18799,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) + public static SignalServiceProtos.AttachmentPointer parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) + public static SignalServiceProtos.AttachmentPointer parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseDelimitedFrom( + public static SignalServiceProtos.AttachmentPointer parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parseFrom( + public static SignalServiceProtos.AttachmentPointer parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -18854,7 +18854,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer prototype) { + public static Builder newBuilder(SignalServiceProtos.AttachmentPointer prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -18870,20 +18870,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder { + implements SignalServiceProtos.AttachmentPointerOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.class, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder.class); + SignalServiceProtos.AttachmentPointer.class, SignalServiceProtos.AttachmentPointer.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.AttachmentPointer.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -18936,23 +18936,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; + return SignalServiceProtos.internal_static_signalservice_AttachmentPointer_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + public SignalServiceProtos.AttachmentPointer getDefaultInstanceForType() { + return SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer result = buildPartial(); + public SignalServiceProtos.AttachmentPointer build() { + SignalServiceProtos.AttachmentPointer result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer result = new org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer(this); + public SignalServiceProtos.AttachmentPointer buildPartial() { + SignalServiceProtos.AttachmentPointer result = new SignalServiceProtos.AttachmentPointer(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -19009,16 +19009,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer)other); + if (other instanceof SignalServiceProtos.AttachmentPointer) { + return mergeFrom((SignalServiceProtos.AttachmentPointer)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.AttachmentPointer other) { + if (other == SignalServiceProtos.AttachmentPointer.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -19079,11 +19079,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer parsedMessage = null; + SignalServiceProtos.AttachmentPointer parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.AttachmentPointer) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -19727,7 +19727,7 @@ public final class SignalServiceProtos { * @required * */ - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType(); + SignalServiceProtos.GroupContext.Type getType(); // optional string name = 3; /** @@ -19772,11 +19772,11 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar(); + SignalServiceProtos.AttachmentPointer getAvatar(); /** * optional .signalservice.AttachmentPointer avatar = 5; */ - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); + SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder(); // repeated string admins = 6; /** @@ -19856,7 +19856,7 @@ public final class SignalServiceProtos { } case 16: { int rawValue = input.readEnum(); - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type value = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.valueOf(rawValue); + SignalServiceProtos.GroupContext.Type value = SignalServiceProtos.GroupContext.Type.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(2, rawValue); } else { @@ -19879,11 +19879,11 @@ public final class SignalServiceProtos { break; } case 42: { - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; + SignalServiceProtos.AttachmentPointer.Builder subBuilder = null; if (((bitField0_ & 0x00000008) == 0x00000008)) { subBuilder = avatar_.toBuilder(); } - avatar_ = input.readMessage(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); + avatar_ = input.readMessage(SignalServiceProtos.AttachmentPointer.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(avatar_); avatar_ = subBuilder.buildPartial(); @@ -19919,14 +19919,14 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.class, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder.class); + SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); } public static com.google.protobuf.Parser PARSER = @@ -20028,7 +20028,7 @@ public final class SignalServiceProtos { } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); + return SignalServiceProtos.GroupContext.getDescriptor().getEnumTypes().get(0); } private static final Type[] VALUES = values(); @@ -20080,7 +20080,7 @@ public final class SignalServiceProtos { // optional .signalservice.GroupContext.Type type = 2; public static final int TYPE_FIELD_NUMBER = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type type_; + private SignalServiceProtos.GroupContext.Type type_; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20098,7 +20098,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType() { + public SignalServiceProtos.GroupContext.Type getType() { return type_; } @@ -20177,7 +20177,7 @@ public final class SignalServiceProtos { // optional .signalservice.AttachmentPointer avatar = 5; public static final int AVATAR_FIELD_NUMBER = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer avatar_; + private SignalServiceProtos.AttachmentPointer avatar_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20187,13 +20187,13 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar() { + public SignalServiceProtos.AttachmentPointer getAvatar() { return avatar_; } /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { return avatar_; } @@ -20229,10 +20229,10 @@ public final class SignalServiceProtos { private void initFields() { id_ = com.google.protobuf.ByteString.EMPTY; - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; name_ = ""; members_ = com.google.protobuf.LazyStringArrayList.EMPTY; - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); admins_ = com.google.protobuf.LazyStringArrayList.EMPTY; } private byte memoizedIsInitialized = -1; @@ -20326,53 +20326,53 @@ public final class SignalServiceProtos { return super.writeReplace(); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom(byte[] data) + public static SignalServiceProtos.GroupContext parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) + public static SignalServiceProtos.GroupContext parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) + public static SignalServiceProtos.GroupContext parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseDelimitedFrom( + public static SignalServiceProtos.GroupContext parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parseFrom( + public static SignalServiceProtos.GroupContext parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -20381,7 +20381,7 @@ public final class SignalServiceProtos { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext prototype) { + public static Builder newBuilder(SignalServiceProtos.GroupContext prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -20397,20 +20397,20 @@ public final class SignalServiceProtos { */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContextOrBuilder { + implements SignalServiceProtos.GroupContextOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable + return SignalServiceProtos.internal_static_signalservice_GroupContext_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.class, org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Builder.class); + SignalServiceProtos.GroupContext.class, SignalServiceProtos.GroupContext.Builder.class); } - // Construct using org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.newBuilder() + // Construct using org.session.libsignal.protos.SignalServiceProtos.GroupContext.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -20433,14 +20433,14 @@ public final class SignalServiceProtos { super.clear(); id_ = com.google.protobuf.ByteString.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; bitField0_ = (bitField0_ & ~0x00000002); name_ = ""; bitField0_ = (bitField0_ & ~0x00000004); members_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); if (avatarBuilder_ == null) { - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); } else { avatarBuilder_.clear(); } @@ -20456,23 +20456,23 @@ public final class SignalServiceProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; + return SignalServiceProtos.internal_static_signalservice_GroupContext_descriptor; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext getDefaultInstanceForType() { - return org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance(); + public SignalServiceProtos.GroupContext getDefaultInstanceForType() { + return SignalServiceProtos.GroupContext.getDefaultInstance(); } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext build() { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext result = buildPartial(); + public SignalServiceProtos.GroupContext build() { + SignalServiceProtos.GroupContext result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext buildPartial() { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext result = new org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext(this); + public SignalServiceProtos.GroupContext buildPartial() { + SignalServiceProtos.GroupContext result = new SignalServiceProtos.GroupContext(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -20513,16 +20513,16 @@ public final class SignalServiceProtos { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext) { - return mergeFrom((org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext)other); + if (other instanceof SignalServiceProtos.GroupContext) { + return mergeFrom((SignalServiceProtos.GroupContext)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext other) { - if (other == org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.getDefaultInstance()) return this; + public Builder mergeFrom(SignalServiceProtos.GroupContext other) { + if (other == SignalServiceProtos.GroupContext.getDefaultInstance()) return this; if (other.hasId()) { setId(other.getId()); } @@ -20575,11 +20575,11 @@ public final class SignalServiceProtos { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext parsedMessage = null; + SignalServiceProtos.GroupContext parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); + parsedMessage = (SignalServiceProtos.GroupContext) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -20643,7 +20643,7 @@ public final class SignalServiceProtos { } // optional .signalservice.GroupContext.Type type = 2; - private org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + private SignalServiceProtos.GroupContext.Type type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; /** * optional .signalservice.GroupContext.Type type = 2; * @@ -20661,7 +20661,7 @@ public final class SignalServiceProtos { * @required * */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type getType() { + public SignalServiceProtos.GroupContext.Type getType() { return type_; } /** @@ -20671,7 +20671,7 @@ public final class SignalServiceProtos { * @required * */ - public Builder setType(org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type value) { + public Builder setType(SignalServiceProtos.GroupContext.Type value) { if (value == null) { throw new NullPointerException(); } @@ -20689,7 +20689,7 @@ public final class SignalServiceProtos { */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000002); - type_ = org.session.libsignal.service.internal.push.SignalServiceProtos.GroupContext.Type.UNKNOWN; + type_ = SignalServiceProtos.GroupContext.Type.UNKNOWN; onChanged(); return this; } @@ -20862,9 +20862,9 @@ public final class SignalServiceProtos { } // optional .signalservice.AttachmentPointer avatar = 5; - private org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + private SignalServiceProtos.AttachmentPointer avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> avatarBuilder_; /** * optional .signalservice.AttachmentPointer avatar = 5; */ @@ -20874,7 +20874,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer getAvatar() { + public SignalServiceProtos.AttachmentPointer getAvatar() { if (avatarBuilder_ == null) { return avatar_; } else { @@ -20884,7 +20884,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder setAvatar(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder setAvatar(SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -20901,7 +20901,7 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ public Builder setAvatar( - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder builderForValue) { + SignalServiceProtos.AttachmentPointer.Builder builderForValue) { if (avatarBuilder_ == null) { avatar_ = builderForValue.build(); onChanged(); @@ -20914,12 +20914,12 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public Builder mergeAvatar(org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer value) { + public Builder mergeAvatar(SignalServiceProtos.AttachmentPointer value) { if (avatarBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && - avatar_ != org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { + avatar_ != SignalServiceProtos.AttachmentPointer.getDefaultInstance()) { avatar_ = - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); + SignalServiceProtos.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial(); } else { avatar_ = value; } @@ -20935,7 +20935,7 @@ public final class SignalServiceProtos { */ public Builder clearAvatar() { if (avatarBuilder_ == null) { - avatar_ = org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.getDefaultInstance(); + avatar_ = SignalServiceProtos.AttachmentPointer.getDefaultInstance(); onChanged(); } else { avatarBuilder_.clear(); @@ -20946,7 +20946,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { + public SignalServiceProtos.AttachmentPointer.Builder getAvatarBuilder() { bitField0_ |= 0x00000010; onChanged(); return getAvatarFieldBuilder().getBuilder(); @@ -20954,7 +20954,7 @@ public final class SignalServiceProtos { /** * optional .signalservice.AttachmentPointer avatar = 5; */ - public org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { + public SignalServiceProtos.AttachmentPointerOrBuilder getAvatarOrBuilder() { if (avatarBuilder_ != null) { return avatarBuilder_.getMessageOrBuilder(); } else { @@ -20965,11 +20965,11 @@ public final class SignalServiceProtos { * optional .signalservice.AttachmentPointer avatar = 5; */ private com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder> + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder> getAvatarFieldBuilder() { if (avatarBuilder_ == null) { avatarBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointer.Builder, org.session.libsignal.service.internal.push.SignalServiceProtos.AttachmentPointerOrBuilder>( + SignalServiceProtos.AttachmentPointer, SignalServiceProtos.AttachmentPointer.Builder, SignalServiceProtos.AttachmentPointerOrBuilder>( avatar_, getParentForChildren(), isClean()); diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java index 0b6d2fbc53..96cc6c5559 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.api.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.internal.push.SignalServiceProtos; +import org.session.libsignal.protos.SignalServiceProtos; public class SignalServiceContent { private final String sender; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java index 8ce3dca98e..4d83315873 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java @@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.messages.shared.SharedContact; import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; +import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; import java.util.LinkedList; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java index 816fd8b04b..1ddb46bf85 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java @@ -9,7 +9,7 @@ package org.session.libsignal.service.api.messages; import com.google.protobuf.ByteString; import org.session.libsignal.service.api.push.SignalServiceAddress; -import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope; +import org.session.libsignal.protos.SignalServiceProtos.Envelope; /** * This class represents an encrypted Signal Service envelope. diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java index 081c73244f..5d04aafc46 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java @@ -1,7 +1,7 @@ package org.session.libsignal.service.internal.push; -import org.session.libsignal.service.internal.push.http.OutputStreamFactory; +import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java index 9e878985c5..d02bd7b2c6 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.internal.push; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; -import org.session.libsignal.service.internal.push.http.OutputStreamFactory; +import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java index 08924fa957..3158d35f73 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherInputStream.java @@ -8,7 +8,7 @@ package org.session.libsignal.streams; import org.session.libsignal.exceptions.InvalidMacException; import org.session.libsignal.exceptions.InvalidMessageException; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.File; import java.io.FileInputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java index 578dc82c69..91c3563700 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStream.java @@ -6,7 +6,7 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java similarity index 68% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java index f5a0657d31..4d1c793f08 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/AttachmentCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/AttachmentCipherOutputStreamFactory.java @@ -1,7 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - -import org.session.libsignal.streams.AttachmentCipherOutputStream; -import org.session.libsignal.streams.DigestingOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java index b1f5e2a081..aa69608cd1 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ContentLengthInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java rename to libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java index d4806c5103..ee8b750937 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java @@ -1,7 +1,5 @@ -package org.session.libsignal.service.internal.push.http; +package org.session.libsignal.streams; - -import org.session.libsignal.streams.DigestingOutputStream; import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java similarity index 59% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java index 592c037d7b..4ca2f1b6ef 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/OutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/OutputStreamFactory.java @@ -1,7 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - - -import org.session.libsignal.streams.DigestingOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; @@ -9,5 +6,4 @@ import java.io.OutputStream; public interface OutputStreamFactory { public DigestingOutputStream createFor(OutputStream wrap) throws IOException; - } diff --git a/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java index e57aca6fc0..8e4c52c3cb 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/PaddingInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt index 2c1e118dac..07edc106cc 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt +++ b/libsignal/src/main/java/org/session/libsignal/streams/PlaintextOutputStreamFactory.kt @@ -1,6 +1,5 @@ package org.session.libsignal.streams -import org.session.libsignal.service.internal.push.http.OutputStreamFactory import java.io.OutputStream /** diff --git a/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java index c982a503d7..aa15eb00c6 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherInputStream.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.internal.util.Util; +import org.session.libsignal.utilities.Util; import java.io.FilterInputStream; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java similarity index 68% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java rename to libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java index 14a76c3991..d29be29602 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/http/ProfileCipherOutputStreamFactory.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/ProfileCipherOutputStreamFactory.java @@ -1,8 +1,4 @@ -package org.session.libsignal.service.internal.push.http; - - -import org.session.libsignal.streams.DigestingOutputStream; -import org.session.libsignal.streams.ProfileCipherOutputStream; +package org.session.libsignal.streams; import java.io.IOException; import java.io.OutputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java b/libsignal/src/main/java/org/session/libsignal/utilities/Util.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Util.java index 71813ab3a4..2c9436485f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/util/Util.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Util.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.util; +package org.session.libsignal.utilities; import java.io.ByteArrayOutputStream; import java.io.IOException; From c1548a4e51a013294dd84f4ce6372bae2a431a37 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:50:16 +1000 Subject: [PATCH 28/29] Move files --- .../thoughtcrime/securesms/ApplicationContext.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 6 +++--- .../securesms/contactshare/ContactModelMapper.java | 2 +- .../conversation/ConversationActivity.java | 2 +- .../securesms/database/GroupDatabase.java | 4 ++-- .../securesms/database/PushDatabase.java | 2 +- .../org/thoughtcrime/securesms/database/Storage.kt | 4 ++-- .../securesms/jobs/AvatarDownloadJob.java | 4 ++-- .../securesms/jobs/RetrieveProfileAvatarJob.java | 2 +- .../securesms/loki/activities/PathActivity.kt | 2 +- .../securesms/loki/database/LokiAPIDatabase.kt | 4 ++-- .../securesms/loki/database/LokiMessageDatabase.kt | 2 +- .../securesms/loki/database/LokiUserDatabase.kt | 2 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 2 +- .../securesms/loki/protocol/SessionMetaProtocol.kt | 5 ++--- .../loki/views/MentionCandidateSelectionView.kt | 2 +- .../securesms/loki/views/MentionCandidateView.kt | 2 +- .../securesms/service/ExpiringMessageManager.java | 2 +- .../libsession/database/MessageDataProvider.kt | 4 ++-- .../session/libsession/messaging/StorageProtocol.kt | 4 ++-- .../messaging/file_server/FileServerAPI.kt | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 6 +++--- .../libsession/messaging/mentions}/Mention.kt | 2 +- .../messaging/mentions/MentionsManager.kt | 3 +-- .../messages/signal/IncomingMediaMessage.java | 4 ++-- .../messages/signal/IncomingTextMessage.java | 2 +- .../messaging/messages/visible/Attachment.kt | 2 +- .../messaging/open_groups/OpenGroupMessageV2.kt | 2 +- .../messaging/sending_receiving/MessageReceiver.kt | 2 +- .../messaging/sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../sending_receiving/ReceivedMessageHandler.kt | 2 +- .../attachments/PointerAttachment.java | 4 ++-- .../attachments/SessionServiceAttachment.kt | 2 +- .../attachments/SessionServiceAttachmentStream.kt | 2 +- .../messaging/sending_receiving/pollers/Poller.kt | 2 +- .../libsession/messaging/utilities/DotNetAPI.kt | 10 +++++----- .../messaging/utilities/UpdateMessageData.kt | 2 +- .../org/session/libsession/snode/OnionRequestAPI.kt | 13 ++++++------- .../java/org/session/libsession/snode/SnodeAPI.kt | 4 ++-- .../org/session/libsession/snode/SnodeModule.kt | 2 +- .../org/session/libsession/snode/StorageProtocol.kt | 2 +- .../libsession/utilities/DownloadUtilities.kt | 6 +++--- .../org/session/libsession/utilities/GroupUtil.kt | 2 +- .../libsession/utilities/ProfilePictureUtilities.kt | 2 +- .../push => crypto}/PushTransportDetails.java | 3 +-- .../loki => database}/LokiAPIDatabaseProtocol.kt | 3 ++- .../LokiMessageDatabaseProtocol.kt | 2 +- .../LokiOpenGroupDatabaseProtocol.kt | 2 +- .../loki => database}/LokiUserDatabaseProtocol.kt | 2 +- .../NonSuccessfulResponseCodeException.java | 2 +- .../push => }/exceptions/PushNetworkException.java | 2 +- .../messages/shared => messages}/SharedContact.java | 3 +-- .../api => }/messages/SignalServiceAttachment.java | 2 +- .../messages/SignalServiceAttachmentPointer.java | 2 +- .../messages/SignalServiceAttachmentStream.java | 2 +- .../api => }/messages/SignalServiceContent.java | 2 +- .../api => }/messages/SignalServiceDataMessage.java | 5 ++--- .../api => }/messages/SignalServiceEnvelope.java | 4 ++-- .../api => }/messages/SignalServiceGroup.java | 2 +- .../messages/SignalServiceReceiptMessage.java | 3 +-- .../messages/SignalServiceTypingMessage.java | 2 +- .../service/api/SignalServiceMessageReceiver.java | 6 +++--- .../libsignal/streams/DigestingRequestBody.java | 2 +- .../api/util => streams}/StreamDetails.java | 3 +-- .../push => utilities}/ProfileAvatarData.java | 3 +-- .../push => utilities}/PushAttachmentData.java | 4 ++-- .../push => utilities}/SignalServiceAddress.java | 2 +- .../libsignal/{service/loki => utilities}/Snode.kt | 2 +- 69 files changed, 100 insertions(+), 108 deletions(-) rename {libsignal/src/main/java/org/session/libsignal/service/loki => libsession/src/main/java/org/session/libsession/messaging/mentions}/Mention.kt (57%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => crypto}/PushTransportDetails.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiAPIDatabaseProtocol.kt (96%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiMessageDatabaseProtocol.kt (81%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiOpenGroupDatabaseProtocol.kt (79%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiUserDatabaseProtocol.kt (83%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => }/exceptions/NonSuccessfulResponseCodeException.java (83%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => }/exceptions/PushNetworkException.java (85%) rename libsignal/src/main/java/org/session/libsignal/{service/api/messages/shared => messages}/SharedContact.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachment.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachmentPointer.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachmentStream.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceContent.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceDataMessage.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceEnvelope.java (96%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceGroup.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceReceiptMessage.java (93%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceTypingMessage.java (92%) rename libsignal/src/main/java/org/session/libsignal/{service/api/util => streams}/StreamDetails.java (91%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => utilities}/ProfileAvatarData.java (94%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => utilities}/PushAttachmentData.java (89%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => utilities}/SignalServiceAddress.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Snode.kt (94%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index f57a6e40ac..0d30797ec4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -48,7 +48,7 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper; import org.session.libsession.utilities.dynamiclanguage.LocaleParser; import org.session.libsession.utilities.preferences.ProfileKeyUtil; -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; +import org.session.libsignal.database.LokiAPIDatabaseProtocol; import org.session.libsignal.utilities.ThreadUtils; import org.session.libsignal.utilities.Log; import org.signal.aesgcmprovider.AesGcmProvider; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 7889f578bf..69eb94ab42 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -11,9 +11,9 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.Util import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachment -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachment +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentStream import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.AttachmentDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java index 7ed743f801..5a77a88828 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.shared.SharedContact; +import org.session.libsignal.messages.SharedContact; import java.util.ArrayList; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 97e701ac43..dd1223efaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -114,7 +114,7 @@ import org.session.libsession.utilities.concurrent.AssertedSuccessListener; import org.session.libsession.utilities.views.Stub; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.loki.Mention; +import org.session.libsession.messaging.mentions.Mention; import org.session.libsignal.utilities.HexEncodingKt; import org.session.libsignal.utilities.PublicKeyValidation; import org.session.libsignal.utilities.ListenableFuture; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index aa5aad182a..50d5bca7b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -24,8 +24,8 @@ import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.database.LokiOpenGroupDatabaseProtocol; import java.io.Closeable; import java.security.SecureRandom; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 70db382976..d1ba25aa7e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -11,7 +11,7 @@ import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceEnvelope; +import org.session.libsignal.messages.SignalServiceEnvelope; import org.session.libsignal.utilities.Util; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index caa0be3987..f4a603c48e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -32,8 +32,8 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceGroup import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 1f87d355cd..ea2bae5cc3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -20,8 +20,8 @@ import org.session.libsignal.utilities.Hex; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 4f7407ecbc..9e28f78b89 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -14,7 +14,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.streams.ProfileCipherInputStream; -import org.session.libsignal.service.api.push.exceptions.PushNetworkException; +import org.session.libsignal.exceptions.PushNetworkException; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt index f4f708aeda..f7e91da108 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.loki.utilities.* import org.thoughtcrime.securesms.loki.views.GlowViewUtilities import org.thoughtcrime.securesms.loki.views.PathDotView -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode class PathActivity : PassphraseRequiredActionBarActivity() { private val broadcastReceivers = mutableListOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index 1b77f213f1..15e76ac0ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -7,8 +7,8 @@ import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.utilities.Snode +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.PublicKeyValidation import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt index 83dc565117..bc2d71f7c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt @@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.loki.utilities.* -import org.session.libsignal.service.loki.LokiMessageDatabaseProtocol +import org.session.libsignal.database.LokiMessageDatabaseProtocol class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiMessageDatabaseProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt index 1d2cb01442..6b9c1cc323 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.loki.utilities.get import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.LokiUserDatabaseProtocol +import org.session.libsignal.database.LokiUserDatabaseProtocol class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiUserDatabaseProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 646d2ac8c3..b3f5b18925 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.* import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt index efc83d0812..3886ce8230 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt @@ -4,12 +4,11 @@ import android.content.Context import org.thoughtcrime.securesms.ApplicationContext import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.RecipientDatabase import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.api.messages.SignalServiceContent -import org.session.libsignal.service.api.messages.SignalServiceDataMessage +import org.session.libsignal.messages.SignalServiceContent +import org.session.libsignal.messages.SignalServiceDataMessage import java.security.MessageDigest object SessionMetaProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt index 2da55501cf..d702610668 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt @@ -10,7 +10,7 @@ import android.widget.ListView import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.utilities.toPx import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsignal.service.loki.Mention +import org.session.libsession.messaging.mentions.Mention class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ListView(context, attrs, defStyleAttr) { private var mentionCandidates = listOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt index f353402806..07233c3e06 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt @@ -9,7 +9,7 @@ import android.widget.LinearLayout import kotlinx.android.synthetic.main.view_mention_candidate.view.* import network.loki.messenger.R import org.session.libsession.messaging.open_groups.OpenGroupAPI -import org.session.libsignal.service.loki.Mention +import org.session.libsession.messaging.mentions.Mention import org.thoughtcrime.securesms.mms.GlideRequests class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 4fed24c7af..31782f244a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -12,7 +12,7 @@ import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceGroup; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt index ba33ec5a58..fef2acf6da 100644 --- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt +++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt @@ -4,8 +4,8 @@ import org.session.libsession.messaging.open_groups.OpenGroup import org.session.libsession.messaging.sending_receiving.attachments.* import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.utilities.DotNetAPI -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentStream import java.io.InputStream interface MessageDataProvider { diff --git a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt index 5fa1dd3e3f..ba711f4adb 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt @@ -20,8 +20,8 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.GroupRecord import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceGroup interface StorageProtocol { diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt index 551567b569..aeca8b2562 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt @@ -8,7 +8,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.* import java.net.URL diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index d4622f9031..2928b3a9dc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -14,9 +14,9 @@ import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsignal.streams.AttachmentCipherOutputStream -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachmentStream import org.session.libsignal.streams.PaddingInputStream -import org.session.libsignal.service.internal.push.PushAttachmentData +import org.session.libsignal.utilities.PushAttachmentData import org.session.libsignal.streams.AttachmentCipherOutputStreamFactory import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.utilities.Util @@ -68,7 +68,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess } else { // V1 open group val server = v1OpenGroup.server val pushData = PushAttachmentData(attachment.contentType, attachment.inputStream, - attachment.length, PlaintextOutputStreamFactory(), attachment.listener) + attachment.length, PlaintextOutputStreamFactory(), attachment.listener) val result = FileServerAPI.shared.uploadAttachment(server, pushData) handleSuccess(attachment, ByteArray(0), result) } diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt b/libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt similarity index 57% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt rename to libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt index 0dd2165854..fb70767284 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt @@ -1,3 +1,3 @@ -package org.session.libsignal.service.loki +package org.session.libsession.messaging.mentions data class Mention(val publicKey: String, val displayName: String) diff --git a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt index e421489b19..5ee6452112 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt @@ -1,9 +1,8 @@ package org.session.libsession.messaging.mentions import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.service.loki.Mention -import org.session.libsignal.service.loki.LokiUserDatabaseProtocol +import org.session.libsignal.database.LokiUserDatabaseProtocol class MentionsManager(private val userPublicKey: String, private val userDatabase: LokiUserDatabaseProtocol) { var userPublicKeyCache = mutableMapOf>() // Thread ID to set of user hex encoded public keys diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java index 42bb18ff93..bea675ee44 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java @@ -10,8 +10,8 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceAttachment; +import org.session.libsignal.messages.SignalServiceGroup; import java.util.Collections; import java.util.LinkedList; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 0e958d57ea..ca54a62f71 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -11,7 +11,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceGroup; public class IncomingTextMessage implements Parcelable { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index ee5a7f3fe3..8d7ef71096 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -6,7 +6,7 @@ import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentPointer import org.session.libsignal.protos.SignalServiceProtos import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 0a606ad3fd..f8e6d434e2 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt index 2052de4f6d..3e4d9714e0 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos object MessageReceiver { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 28b778c5fa..03e8c359ef 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -21,7 +21,7 @@ import org.session.libsession.snode.SnodeModule import org.session.libsession.snode.SnodeMessage import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 207b0bedd1..cec3b8c240 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -15,7 +15,7 @@ import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 12aef6120f..d0b012db12 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -24,7 +24,7 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index d6ba340dc0..9420adc76d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -6,8 +6,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; +import org.session.libsignal.messages.SignalServiceAttachment; +import org.session.libsignal.messages.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; import org.session.libsignal.protos.SignalServiceProtos; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt index c96947cab0..5da7630ba8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachment +import org.session.libsignal.messages.SignalServiceAttachment import java.io.InputStream abstract class SessionServiceAttachment protected constructor(val contentType: String?) { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 6f20657a58..72966f908c 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -9,7 +9,7 @@ import android.util.Size import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.protos.SignalServiceProtos -import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment +import org.session.libsignal.messages.SignalServiceAttachment as SAttachment import java.io.InputStream import kotlin.math.round diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt index f1298d2699..a2471d1202 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsession.snode.SnodeModule -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode import org.session.libsignal.utilities.Log import java.security.SecureRandom import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 0567f73c4f..fc9751f998 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -12,11 +12,11 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.crypto.DiffieHellman import org.session.libsignal.streams.ProfileCipherOutputStream -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException -import org.session.libsignal.service.api.push.exceptions.PushNetworkException -import org.session.libsignal.service.api.util.StreamDetails -import org.session.libsignal.service.internal.push.ProfileAvatarData -import org.session.libsignal.service.internal.push.PushAttachmentData +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException +import org.session.libsignal.exceptions.PushNetworkException +import org.session.libsignal.streams.StreamDetails +import org.session.libsignal.utilities.ProfileAvatarData +import org.session.libsignal.utilities.PushAttachmentData import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt index e5063bd69f..61ab82918d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.utilities import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.core.JsonParseException -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.Log import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index bbfb9e10e9..f3d062ab09 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -11,8 +11,7 @@ import org.session.libsession.utilities.AESGCM import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.* -import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.* +import org.session.libsignal.utilities.Snode import org.session.libsession.utilities.AESGCM.EncryptionResult import org.session.libsession.utilities.getBodyForOnionRequest import org.session.libsession.utilities.getHeadersForOnionRequest @@ -20,7 +19,7 @@ import org.session.libsignal.crypto.getRandomElement import org.session.libsignal.crypto.getRandomElementOrNull import org.session.libsignal.utilities.Broadcaster import org.session.libsignal.utilities.HTTP -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol private typealias Path = List @@ -75,13 +74,13 @@ object OnionRequestAPI { class InsufficientSnodesException : Exception("Couldn't find enough snodes to build a path.") private data class OnionBuildingResult( - val guardSnode: Snode, - val finalEncryptionResult: EncryptionResult, - val destinationSymmetricKey: ByteArray + val guardSnode: Snode, + val finalEncryptionResult: EncryptionResult, + val destinationSymmetricKey: ByteArray ) internal sealed class Destination { - class Snode(val snode: org.session.libsignal.service.loki.Snode) : Destination() + class Snode(val snode: org.session.libsignal.utilities.Snode) : Destination() class Server(val host: String, val target: String, val x25519PublicKey: String, val scheme: String, val port: Int) : Destination() } diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index 21581d255f..b12c5f3672 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -9,9 +9,9 @@ import nl.komponents.kovenant.functional.map import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement import org.session.libsignal.protos.SignalServiceProtos -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode import org.session.libsignal.utilities.HTTP -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.Broadcaster import org.session.libsignal.utilities.prettifiedDescription import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt index 92faffcba4..049c536027 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt @@ -1,6 +1,6 @@ package org.session.libsession.snode -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.Broadcaster class SnodeModule(val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster) { diff --git a/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt index 7e0d103974..b555acddbd 100644 --- a/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt @@ -1,6 +1,6 @@ package org.session.libsession.snode -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode interface SnodeStorageProtocol { diff --git a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt index 6067cef770..48bcc89ba1 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt @@ -6,9 +6,9 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Log -import org.session.libsignal.service.api.messages.SignalServiceAttachment -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException -import org.session.libsignal.service.api.push.exceptions.PushNetworkException +import org.session.libsignal.messages.SignalServiceAttachment +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException +import org.session.libsignal.exceptions.PushNetworkException import org.session.libsignal.utilities.Base64 import java.io.* diff --git a/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt b/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt index 7d7422494b..11477637c2 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt @@ -1,6 +1,6 @@ package org.session.libsession.utilities -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.utilities.Hex import java.io.IOException import kotlin.jvm.Throws diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index ddffb2cc2c..60f4656e3c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -7,7 +7,7 @@ import okio.Buffer import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.streams.ProfileCipherOutputStream -import org.session.libsignal.service.internal.push.ProfileAvatarData +import org.session.libsignal.utilities.ProfileAvatarData import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.retryIfNeeded diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java b/libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java rename to libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java index 031e7880f1..bdd9964d5e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java @@ -4,8 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.push; - +package org.session.libsignal.crypto; import org.session.libsignal.utilities.Log; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt index c1886ed0cc..4202c34741 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt @@ -1,6 +1,7 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database import org.session.libsignal.crypto.ecc.ECKeyPair +import org.session.libsignal.utilities.Snode import java.util.* interface LokiAPIDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt similarity index 81% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt index 3f4c21e341..e7c740f6b4 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiMessageDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt similarity index 79% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt index 4c983e33fc..28bcecdbd9 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiOpenGroupDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt index b4428a4edf..1f57a6ff51 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiUserDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java index 40a00e0a2c..8e3262ef48 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push.exceptions; +package org.session.libsignal.exceptions; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java similarity index 85% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java index 6773953faf..2b41fe8405 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push.exceptions; +package org.session.libsignal.exceptions; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java b/libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java rename to libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java index 6a09521e4f..f12f0d0804 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java @@ -1,7 +1,6 @@ -package org.session.libsignal.service.api.messages.shared; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; import java.util.LinkedList; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java index 94bfc2fe25..d01d4e4efc 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java index e5d9641dbf..5e4c85853c 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java index b4d27ee422..183bb9aab9 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java index 96cc6c5559..fe3a0a9df7 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.protos.SignalServiceProtos; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java index 4d83315873..de9d8d9a31 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java @@ -4,11 +4,10 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.shared.SharedContact; -import org.session.libsignal.service.api.push.SignalServiceAddress; +import org.session.libsignal.utilities.SignalServiceAddress; import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; import java.util.LinkedList; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java index 1ddb46bf85..38d45694ed 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java @@ -4,11 +4,11 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import com.google.protobuf.ByteString; -import org.session.libsignal.service.api.push.SignalServiceAddress; +import org.session.libsignal.utilities.SignalServiceAddress; import org.session.libsignal.protos.SignalServiceProtos.Envelope; /** diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java index 87285bc4fb..6b38526c33 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java similarity index 93% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java index 83d891eb78..77371ab9ed 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.messages; - +package org.session.libsignal.messages; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java index 81a4879ffc..579b09437b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; public class SignalServiceTypingMessage { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index 3f159be2f4..d920d8d73d 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -7,9 +7,9 @@ package org.session.libsignal.service.api; import org.session.libsignal.exceptions.InvalidMessageException; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.messages.SignalServiceDataMessage; import java.io.File; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java index ee8b750937..4eb739368a 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java b/libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java rename to libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java index 046df29591..529e16beec 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.util; - +package org.session.libsignal.streams; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java b/libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java index 5d04aafc46..df0f45cd10 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.internal.push; - +package org.session.libsignal.utilities; import org.session.libsignal.streams.OutputStreamFactory; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java b/libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java similarity index 89% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java rename to libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java index d02bd7b2c6..b0a6cd54d3 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java @@ -4,9 +4,9 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.push; +package org.session.libsignal.utilities; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java b/libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java rename to libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java index 4033aef2e0..031076a5e6 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push; +package org.session.libsignal.utilities; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt index 8c4f22854f..af4a1f694f 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.utilities class Snode(val address: String, val port: Int, val publicKeySet: KeySet?) { val ip: String get() = address.removePrefix("https://") From 47ff53d55992a9229a5d4a4eb926d2a7e451e899 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:54:16 +1000 Subject: [PATCH 29/29] Remove SignalServiceMessageReceiver --- .../SignalCommunicationModule.java | 15 +---- .../securesms/jobs/AvatarDownloadJob.java | 3 - .../jobs/RetrieveProfileAvatarJob.java | 2 - .../linkpreview/LinkPreviewRepository.java | 3 - .../SessionServiceAttachmentPointer.kt | 2 +- .../SignalServiceAttachmentPointer.java | 3 +- .../api/SignalServiceMessageReceiver.java | 65 ------------------- 7 files changed, 3 insertions(+), 90 deletions(-) delete mode 100644 libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java index 33122e0e83..00167232bf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java @@ -2,14 +2,12 @@ package org.thoughtcrime.securesms.dependencies; import android.content.Context; -import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.thoughtcrime.securesms.jobs.AvatarDownloadJob; import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob; import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; import dagger.Module; -import dagger.Provides; @Module(complete = false, injects = {AvatarDownloadJob.class, RetrieveProfileAvatarJob.class, @@ -20,18 +18,7 @@ public class SignalCommunicationModule { private final Context context; - private SignalServiceMessageReceiver messageReceiver; - public SignalCommunicationModule(Context context) { - this.context = context; - } - - @Provides - synchronized SignalServiceMessageReceiver provideSignalMessageReceiver() { - if (this.messageReceiver == null) { - this.messageReceiver = new SignalServiceMessageReceiver(); - } - - return this.messageReceiver; + this.context = context; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index ea2bae5cc3..d5ce693b6c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.util.BitmapUtil; import org.session.libsignal.utilities.Hex; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.messages.SignalServiceAttachmentPointer; import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException; @@ -40,8 +39,6 @@ public class AvatarDownloadJob extends BaseJob implements InjectableType { private static final String KEY_GROUP_ID = "group_id"; - @Inject SignalServiceMessageReceiver receiver; - private String groupId; public AvatarDownloadJob(@NonNull String groupId) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 9e28f78b89..a310eca3de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -12,7 +12,6 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.DownloadUtilities; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.streams.ProfileCipherInputStream; import org.session.libsignal.exceptions.PushNetworkException; import org.session.libsignal.utilities.Log; @@ -43,7 +42,6 @@ public class RetrieveProfileAvatarJob extends BaseJob implements InjectableType private static final String KEY_PROFILE_AVATAR = "profile_avatar"; private static final String KEY_ADDRESS = "address"; - @Inject SignalServiceMessageReceiver receiver; private String profileAvatar; private Recipient recipient; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index 65f22aa23c..a6f4c801fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -20,7 +20,6 @@ import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor; import org.thoughtcrime.securesms.net.RequestController; import org.thoughtcrime.securesms.providers.BlobProvider; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil.OpenGraph; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; @@ -48,8 +47,6 @@ public class LinkPreviewRepository implements InjectableType { private final OkHttpClient client; - @Inject SignalServiceMessageReceiver messageReceiver; - public LinkPreviewRepository(@NonNull Context context) { this.client = new OkHttpClient.Builder() .addNetworkInterceptor(new ContentProxySafetyInterceptor()) diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt index 170a3b8ead..d9202b2667 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt @@ -10,7 +10,7 @@ import org.session.libsignal.utilities.guava.Optional /** * Represents a received SignalServiceAttachment "handle." This * is a pointer to the actual attachment content, which needs to be - * retrieved using [SignalServiceMessageReceiver.retrieveAttachment] + * retrieved using SignalServiceMessageReceiver.retrieveAttachment * * @author Moxie Marlinspike */ diff --git a/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java index 5e4c85853c..83db5e2b0b 100644 --- a/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java @@ -7,12 +7,11 @@ package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.SignalServiceMessageReceiver; /** * Represents a received SignalServiceAttachment "handle." This * is a pointer to the actual attachment content, which needs to be - * retrieved using {@link SignalServiceMessageReceiver#retrieveAttachment(SignalServiceAttachmentPointer, java.io.File, int)} + * retrieved using SignalServiceMessageReceiver.retrieveAttachment(SignalServiceAttachmentPointer, java.io.File, int) * * @author Moxie Marlinspike */ diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java deleted file mode 100644 index d920d8d73d..0000000000 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.session.libsignal.service.api; - -import org.session.libsignal.exceptions.InvalidMessageException; -import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; -import org.session.libsignal.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.messages.SignalServiceDataMessage; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; - -/** - * The primary interface for receiving Signal Service messages. - * - * @author Moxie Marlinspike - */ -@SuppressWarnings("OptionalUsedAsFieldOrParameterType") -public class SignalServiceMessageReceiver { - /** - * Retrieves a SignalServiceAttachment. - * - * @param pointer The {@link SignalServiceAttachmentPointer} - * received in a {@link SignalServiceDataMessage}. - * @param destination The download destination for this attachment. - * - * @return An InputStream that streams the plaintext attachment contents. - * @throws IOException - * @throws InvalidMessageException - */ - public InputStream retrieveAttachment(SignalServiceAttachmentPointer pointer, File destination, int maxSizeBytes) - throws IOException, InvalidMessageException - { - return retrieveAttachment(pointer, destination, maxSizeBytes, null); - } - - public InputStream retrieveProfileAvatar(String path, File destination, byte[] profileKey, int maxSizeBytes) - throws IOException - { - throw new IOException(); - } - - /** - * Retrieves a SignalServiceAttachment. - * - * @param pointer The {@link SignalServiceAttachmentPointer} - * received in a {@link SignalServiceDataMessage}. - * @param destination The download destination for this attachment. - * @param listener An optional listener (may be null) to receive callbacks on download progress. - * - * @return An InputStream that streams the plaintext attachment contents. - * @throws IOException - * @throws InvalidMessageException - */ - public InputStream retrieveAttachment(SignalServiceAttachmentPointer pointer, File destination, int maxSizeBytes, ProgressListener listener) - throws IOException, InvalidMessageException - { - throw new IOException(); - } -}