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) {