From c1548a4e51a013294dd84f4ce6372bae2a431a37 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:50:16 +1000 Subject: [PATCH] Move files --- .../thoughtcrime/securesms/ApplicationContext.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 6 +++--- .../securesms/contactshare/ContactModelMapper.java | 2 +- .../conversation/ConversationActivity.java | 2 +- .../securesms/database/GroupDatabase.java | 4 ++-- .../securesms/database/PushDatabase.java | 2 +- .../org/thoughtcrime/securesms/database/Storage.kt | 4 ++-- .../securesms/jobs/AvatarDownloadJob.java | 4 ++-- .../securesms/jobs/RetrieveProfileAvatarJob.java | 2 +- .../securesms/loki/activities/PathActivity.kt | 2 +- .../securesms/loki/database/LokiAPIDatabase.kt | 4 ++-- .../securesms/loki/database/LokiMessageDatabase.kt | 2 +- .../securesms/loki/database/LokiUserDatabase.kt | 2 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 2 +- .../securesms/loki/protocol/SessionMetaProtocol.kt | 5 ++--- .../loki/views/MentionCandidateSelectionView.kt | 2 +- .../securesms/loki/views/MentionCandidateView.kt | 2 +- .../securesms/service/ExpiringMessageManager.java | 2 +- .../libsession/database/MessageDataProvider.kt | 4 ++-- .../session/libsession/messaging/StorageProtocol.kt | 4 ++-- .../messaging/file_server/FileServerAPI.kt | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 6 +++--- .../libsession/messaging/mentions}/Mention.kt | 2 +- .../messaging/mentions/MentionsManager.kt | 3 +-- .../messages/signal/IncomingMediaMessage.java | 4 ++-- .../messages/signal/IncomingTextMessage.java | 2 +- .../messaging/messages/visible/Attachment.kt | 2 +- .../messaging/open_groups/OpenGroupMessageV2.kt | 2 +- .../messaging/sending_receiving/MessageReceiver.kt | 2 +- .../messaging/sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../sending_receiving/ReceivedMessageHandler.kt | 2 +- .../attachments/PointerAttachment.java | 4 ++-- .../attachments/SessionServiceAttachment.kt | 2 +- .../attachments/SessionServiceAttachmentStream.kt | 2 +- .../messaging/sending_receiving/pollers/Poller.kt | 2 +- .../libsession/messaging/utilities/DotNetAPI.kt | 10 +++++----- .../messaging/utilities/UpdateMessageData.kt | 2 +- .../org/session/libsession/snode/OnionRequestAPI.kt | 13 ++++++------- .../java/org/session/libsession/snode/SnodeAPI.kt | 4 ++-- .../org/session/libsession/snode/SnodeModule.kt | 2 +- .../org/session/libsession/snode/StorageProtocol.kt | 2 +- .../libsession/utilities/DownloadUtilities.kt | 6 +++--- .../org/session/libsession/utilities/GroupUtil.kt | 2 +- .../libsession/utilities/ProfilePictureUtilities.kt | 2 +- .../push => crypto}/PushTransportDetails.java | 3 +-- .../loki => database}/LokiAPIDatabaseProtocol.kt | 3 ++- .../LokiMessageDatabaseProtocol.kt | 2 +- .../LokiOpenGroupDatabaseProtocol.kt | 2 +- .../loki => database}/LokiUserDatabaseProtocol.kt | 2 +- .../NonSuccessfulResponseCodeException.java | 2 +- .../push => }/exceptions/PushNetworkException.java | 2 +- .../messages/shared => messages}/SharedContact.java | 3 +-- .../api => }/messages/SignalServiceAttachment.java | 2 +- .../messages/SignalServiceAttachmentPointer.java | 2 +- .../messages/SignalServiceAttachmentStream.java | 2 +- .../api => }/messages/SignalServiceContent.java | 2 +- .../api => }/messages/SignalServiceDataMessage.java | 5 ++--- .../api => }/messages/SignalServiceEnvelope.java | 4 ++-- .../api => }/messages/SignalServiceGroup.java | 2 +- .../messages/SignalServiceReceiptMessage.java | 3 +-- .../messages/SignalServiceTypingMessage.java | 2 +- .../service/api/SignalServiceMessageReceiver.java | 6 +++--- .../libsignal/streams/DigestingRequestBody.java | 2 +- .../api/util => streams}/StreamDetails.java | 3 +-- .../push => utilities}/ProfileAvatarData.java | 3 +-- .../push => utilities}/PushAttachmentData.java | 4 ++-- .../push => utilities}/SignalServiceAddress.java | 2 +- .../libsignal/{service/loki => utilities}/Snode.kt | 2 +- 69 files changed, 100 insertions(+), 108 deletions(-) rename {libsignal/src/main/java/org/session/libsignal/service/loki => libsession/src/main/java/org/session/libsession/messaging/mentions}/Mention.kt (57%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => crypto}/PushTransportDetails.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiAPIDatabaseProtocol.kt (96%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiMessageDatabaseProtocol.kt (81%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiOpenGroupDatabaseProtocol.kt (79%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => database}/LokiUserDatabaseProtocol.kt (83%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => }/exceptions/NonSuccessfulResponseCodeException.java (83%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => }/exceptions/PushNetworkException.java (85%) rename libsignal/src/main/java/org/session/libsignal/{service/api/messages/shared => messages}/SharedContact.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachment.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachmentPointer.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceAttachmentStream.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceContent.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceDataMessage.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceEnvelope.java (96%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceGroup.java (98%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceReceiptMessage.java (93%) rename libsignal/src/main/java/org/session/libsignal/{service/api => }/messages/SignalServiceTypingMessage.java (92%) rename libsignal/src/main/java/org/session/libsignal/{service/api/util => streams}/StreamDetails.java (91%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => utilities}/ProfileAvatarData.java (94%) rename libsignal/src/main/java/org/session/libsignal/{service/internal/push => utilities}/PushAttachmentData.java (89%) rename libsignal/src/main/java/org/session/libsignal/{service/api/push => utilities}/SignalServiceAddress.java (97%) rename libsignal/src/main/java/org/session/libsignal/{service/loki => utilities}/Snode.kt (94%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index f57a6e40a..0d30797ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -48,7 +48,7 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper; import org.session.libsession.utilities.dynamiclanguage.LocaleParser; import org.session.libsession.utilities.preferences.ProfileKeyUtil; -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; +import org.session.libsignal.database.LokiAPIDatabaseProtocol; import org.session.libsignal.utilities.ThreadUtils; import org.session.libsignal.utilities.Log; import org.signal.aesgcmprovider.AesGcmProvider; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 7889f578b..69eb94ab4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -11,9 +11,9 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.Util import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachment -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachment +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentStream import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.AttachmentDatabase diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java index 7ed743f80..5a77a8882 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.shared.SharedContact; +import org.session.libsignal.messages.SharedContact; import java.util.ArrayList; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 97e701ac4..dd1223efa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -114,7 +114,7 @@ import org.session.libsession.utilities.concurrent.AssertedSuccessListener; import org.session.libsession.utilities.views.Stub; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.loki.Mention; +import org.session.libsession.messaging.mentions.Mention; import org.session.libsignal.utilities.HexEncodingKt; import org.session.libsignal.utilities.PublicKeyValidation; import org.session.libsignal.utilities.ListenableFuture; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java index aa5aad182..50d5bca7b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -24,8 +24,8 @@ import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.database.LokiOpenGroupDatabaseProtocol; import java.io.Closeable; import java.security.SecureRandom; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 70db38297..d1ba25aa7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -11,7 +11,7 @@ import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Base64; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceEnvelope; +import org.session.libsignal.messages.SignalServiceEnvelope; import org.session.libsignal.utilities.Util; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index caa0be398..f4a603c48 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -32,8 +32,8 @@ import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceGroup import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 1f87d355c..ea2bae5cc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -20,8 +20,8 @@ import org.session.libsignal.utilities.Hex; import org.session.libsignal.exceptions.InvalidMessageException; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 4f7407ecb..9e28f78b8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -14,7 +14,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.streams.ProfileCipherInputStream; -import org.session.libsignal.service.api.push.exceptions.PushNetworkException; +import org.session.libsignal.exceptions.PushNetworkException; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt index f4f708aed..f7e91da10 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/PathActivity.kt @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.loki.utilities.* import org.thoughtcrime.securesms.loki.views.GlowViewUtilities import org.thoughtcrime.securesms.loki.views.PathDotView -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode class PathActivity : PassphraseRequiredActionBarActivity() { private val broadcastReceivers = mutableListOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index 1b77f213f..15e76ac0e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -7,8 +7,8 @@ import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.utilities.Snode +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.PublicKeyValidation import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt index 83dc56511..bc2d71f7c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt @@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.loki.utilities.* -import org.session.libsignal.service.loki.LokiMessageDatabaseProtocol +import org.session.libsignal.database.LokiMessageDatabaseProtocol class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiMessageDatabaseProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt index 1d2cb0144..6b9c1cc32 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.loki.utilities.get import org.thoughtcrime.securesms.loki.utilities.insertOrUpdate import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.loki.LokiUserDatabaseProtocol +import org.session.libsignal.database.LokiUserDatabaseProtocol class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiUserDatabaseProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt index 646d2ac8c..b3f5b1892 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.* import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.protos.SignalServiceProtos.DataMessage import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt index efc83d081..3886ce823 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt @@ -4,12 +4,11 @@ import android.content.Context import org.thoughtcrime.securesms.ApplicationContext import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.RecipientDatabase import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.service.api.messages.SignalServiceContent -import org.session.libsignal.service.api.messages.SignalServiceDataMessage +import org.session.libsignal.messages.SignalServiceContent +import org.session.libsignal.messages.SignalServiceDataMessage import java.security.MessageDigest object SessionMetaProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt index 2da55501c..d70261066 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateSelectionView.kt @@ -10,7 +10,7 @@ import android.widget.ListView import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.utilities.toPx import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsignal.service.loki.Mention +import org.session.libsession.messaging.mentions.Mention class MentionCandidateSelectionView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : ListView(context, attrs, defStyleAttr) { private var mentionCandidates = listOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt index f35340280..07233c3e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt @@ -9,7 +9,7 @@ import android.widget.LinearLayout import kotlinx.android.synthetic.main.view_mention_candidate.view.* import network.loki.messenger.R import org.session.libsession.messaging.open_groups.OpenGroupAPI -import org.session.libsignal.service.loki.Mention +import org.session.libsession.messaging.mentions.Mention import org.thoughtcrime.securesms.mms.GlideRequests class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : LinearLayout(context, attrs, defStyleAttr) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 4fed24c7a..31782f244 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -12,7 +12,7 @@ import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceGroup; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt index ba33ec5a5..fef2acf6d 100644 --- a/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt +++ b/libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt @@ -4,8 +4,8 @@ import org.session.libsession.messaging.open_groups.OpenGroup import org.session.libsession.messaging.sending_receiving.attachments.* import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.utilities.DotNetAPI -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentStream import java.io.InputStream interface MessageDataProvider { diff --git a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt index 5fa1dd3e3..ba711f4ad 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt @@ -20,8 +20,8 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.GroupRecord import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings import org.session.libsignal.crypto.ecc.ECKeyPair -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceGroup interface StorageProtocol { diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt index 551567b56..aeca8b256 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt @@ -8,7 +8,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.* import java.net.URL diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index d4622f903..2928b3a9d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -14,9 +14,9 @@ import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsignal.streams.AttachmentCipherOutputStream -import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream +import org.session.libsignal.messages.SignalServiceAttachmentStream import org.session.libsignal.streams.PaddingInputStream -import org.session.libsignal.service.internal.push.PushAttachmentData +import org.session.libsignal.utilities.PushAttachmentData import org.session.libsignal.streams.AttachmentCipherOutputStreamFactory import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.utilities.Util @@ -68,7 +68,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess } else { // V1 open group val server = v1OpenGroup.server val pushData = PushAttachmentData(attachment.contentType, attachment.inputStream, - attachment.length, PlaintextOutputStreamFactory(), attachment.listener) + attachment.length, PlaintextOutputStreamFactory(), attachment.listener) val result = FileServerAPI.shared.uploadAttachment(server, pushData) handleSuccess(attachment, ByteArray(0), result) } diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt b/libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt similarity index 57% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt rename to libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt index 0dd216585..fb7076728 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/Mention.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/Mention.kt @@ -1,3 +1,3 @@ -package org.session.libsignal.service.loki +package org.session.libsession.messaging.mentions data class Mention(val publicKey: String, val displayName: String) diff --git a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt index e421489b1..5ee645211 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt @@ -1,9 +1,8 @@ package org.session.libsession.messaging.mentions import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.service.loki.Mention -import org.session.libsignal.service.loki.LokiUserDatabaseProtocol +import org.session.libsignal.database.LokiUserDatabaseProtocol class MentionsManager(private val userPublicKey: String, private val userDatabase: LokiUserDatabaseProtocol) { var userPublicKeyCache = mutableMapOf>() // Thread ID to set of user hex encoded public keys diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java index 42bb18ff9..bea675ee4 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java @@ -10,8 +10,8 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceAttachment; +import org.session.libsignal.messages.SignalServiceGroup; import java.util.Collections; import java.util.LinkedList; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java index 0e958d57e..ca54a62f7 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java @@ -11,7 +11,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceGroup; +import org.session.libsignal.messages.SignalServiceGroup; public class IncomingTextMessage implements Parcelable { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt index ee5a7f3fe..8d7ef7109 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Attachment.kt @@ -6,7 +6,7 @@ import com.google.protobuf.ByteString import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer +import org.session.libsignal.messages.SignalServiceAttachmentPointer import org.session.libsignal.protos.SignalServiceProtos import java.io.File diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 0a606ad3f..f8e6d434e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt index 2052de4f6..3e4d9714e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos object MessageReceiver { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 28b778c5f..03e8c359e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -21,7 +21,7 @@ import org.session.libsession.snode.SnodeModule import org.session.libsession.snode.SnodeMessage import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment -import org.session.libsignal.service.internal.push.PushTransportDetails +import org.session.libsignal.crypto.PushTransportDetails import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index 207b0bedd..cec3b8c24 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -15,7 +15,7 @@ import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.crypto.ecc.Curve import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 12aef6120..d0b012db1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -24,7 +24,7 @@ import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.protos.SignalServiceProtos import org.session.libsignal.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.toHexString diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java index d6ba340dc..9420adc76 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/PointerAttachment.java @@ -6,8 +6,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; +import org.session.libsignal.messages.SignalServiceAttachment; +import org.session.libsignal.messages.SignalServiceDataMessage; import org.session.libsignal.utilities.Base64; import org.session.libsignal.protos.SignalServiceProtos; diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt index c96947cab..5da7630ba 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.sending_receiving.attachments import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional -import org.session.libsignal.service.api.messages.SignalServiceAttachment +import org.session.libsignal.messages.SignalServiceAttachment import java.io.InputStream abstract class SessionServiceAttachment protected constructor(val contentType: String?) { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt index 6f20657a5..72966f908 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt @@ -9,7 +9,7 @@ import android.util.Size import com.google.protobuf.ByteString import org.session.libsignal.utilities.guava.Optional import org.session.libsignal.protos.SignalServiceProtos -import org.session.libsignal.service.api.messages.SignalServiceAttachment as SAttachment +import org.session.libsignal.messages.SignalServiceAttachment as SAttachment import java.io.InputStream import kotlin.math.round diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt index f1298d269..a2471d120 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsession.snode.SnodeModule -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode import org.session.libsignal.utilities.Log import java.security.SecureRandom import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index 0567f73c4..fc9751f99 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -12,11 +12,11 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.crypto.DiffieHellman import org.session.libsignal.streams.ProfileCipherOutputStream -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException -import org.session.libsignal.service.api.push.exceptions.PushNetworkException -import org.session.libsignal.service.api.util.StreamDetails -import org.session.libsignal.service.internal.push.ProfileAvatarData -import org.session.libsignal.service.internal.push.PushAttachmentData +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException +import org.session.libsignal.exceptions.PushNetworkException +import org.session.libsignal.streams.StreamDetails +import org.session.libsignal.utilities.ProfileAvatarData +import org.session.libsignal.utilities.PushAttachmentData import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.Hex diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt index e5063bd69..61ab82918 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt @@ -3,7 +3,7 @@ package org.session.libsession.messaging.utilities import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.core.JsonParseException -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.utilities.Log import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index bbfb9e10e..f3d062ab0 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -11,8 +11,7 @@ import org.session.libsession.utilities.AESGCM import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.* -import org.session.libsignal.service.loki.Snode -import org.session.libsignal.service.loki.* +import org.session.libsignal.utilities.Snode import org.session.libsession.utilities.AESGCM.EncryptionResult import org.session.libsession.utilities.getBodyForOnionRequest import org.session.libsession.utilities.getHeadersForOnionRequest @@ -20,7 +19,7 @@ import org.session.libsignal.crypto.getRandomElement import org.session.libsignal.crypto.getRandomElementOrNull import org.session.libsignal.utilities.Broadcaster import org.session.libsignal.utilities.HTTP -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol private typealias Path = List @@ -75,13 +74,13 @@ object OnionRequestAPI { class InsufficientSnodesException : Exception("Couldn't find enough snodes to build a path.") private data class OnionBuildingResult( - val guardSnode: Snode, - val finalEncryptionResult: EncryptionResult, - val destinationSymmetricKey: ByteArray + val guardSnode: Snode, + val finalEncryptionResult: EncryptionResult, + val destinationSymmetricKey: ByteArray ) internal sealed class Destination { - class Snode(val snode: org.session.libsignal.service.loki.Snode) : Destination() + class Snode(val snode: org.session.libsignal.utilities.Snode) : Destination() class Server(val host: String, val target: String, val x25519PublicKey: String, val scheme: String, val port: Int) : Destination() } diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index 21581d255..b12c5f367 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -9,9 +9,9 @@ import nl.komponents.kovenant.functional.map import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.snode.utilities.getRandomElement import org.session.libsignal.protos.SignalServiceProtos -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode import org.session.libsignal.utilities.HTTP -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.Broadcaster import org.session.libsignal.utilities.prettifiedDescription import org.session.libsignal.utilities.removing05PrefixIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt index 92faffcba..049c53602 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeModule.kt @@ -1,6 +1,6 @@ package org.session.libsession.snode -import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol +import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.Broadcaster class SnodeModule(val storage: LokiAPIDatabaseProtocol, val broadcaster: Broadcaster) { diff --git a/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt index 7e0d10397..b555acddb 100644 --- a/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/snode/StorageProtocol.kt @@ -1,6 +1,6 @@ package org.session.libsession.snode -import org.session.libsignal.service.loki.Snode +import org.session.libsignal.utilities.Snode interface SnodeStorageProtocol { diff --git a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt index 6067cef77..48bcc89ba 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt @@ -6,9 +6,9 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Log -import org.session.libsignal.service.api.messages.SignalServiceAttachment -import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException -import org.session.libsignal.service.api.push.exceptions.PushNetworkException +import org.session.libsignal.messages.SignalServiceAttachment +import org.session.libsignal.exceptions.NonSuccessfulResponseCodeException +import org.session.libsignal.exceptions.PushNetworkException import org.session.libsignal.utilities.Base64 import java.io.* diff --git a/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt b/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt index 7d7422494..11477637c 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt @@ -1,6 +1,6 @@ package org.session.libsession.utilities -import org.session.libsignal.service.api.messages.SignalServiceGroup +import org.session.libsignal.messages.SignalServiceGroup import org.session.libsignal.utilities.Hex import java.io.IOException import kotlin.jvm.Throws diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt index ddffb2cc2..60f4656e3 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureUtilities.kt @@ -7,7 +7,7 @@ import okio.Buffer import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.utilities.preferences.ProfileKeyUtil import org.session.libsignal.streams.ProfileCipherOutputStream -import org.session.libsignal.service.internal.push.ProfileAvatarData +import org.session.libsignal.utilities.ProfileAvatarData import org.session.libsignal.streams.DigestingRequestBody import org.session.libsignal.streams.ProfileCipherOutputStreamFactory import org.session.libsignal.utilities.retryIfNeeded diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java b/libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java rename to libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java index 031e7880f..bdd9964d5 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/crypto/PushTransportDetails.java @@ -4,8 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.push; - +package org.session.libsignal.crypto; import org.session.libsignal.utilities.Log; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt index c1886ed0c..4202c3474 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiAPIDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiAPIDatabaseProtocol.kt @@ -1,6 +1,7 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database import org.session.libsignal.crypto.ecc.ECKeyPair +import org.session.libsignal.utilities.Snode import java.util.* interface LokiAPIDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt similarity index 81% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt index 3f4c21e34..e7c740f6b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiMessageDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiMessageDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiMessageDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt similarity index 79% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt index 4c983e33f..28bcecdbd 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiOpenGroupDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiOpenGroupDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiOpenGroupDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt b/libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt rename to libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt index b4428a4ed..1f57a6ff5 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/LokiUserDatabaseProtocol.kt +++ b/libsignal/src/main/java/org/session/libsignal/database/LokiUserDatabaseProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.database interface LokiUserDatabaseProtocol { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java similarity index 83% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java index 40a00e0a2..8e3262ef4 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/NonSuccessfulResponseCodeException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/NonSuccessfulResponseCodeException.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push.exceptions; +package org.session.libsignal.exceptions; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java b/libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java similarity index 85% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java rename to libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java index 6773953fa..2b41fe840 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/exceptions/PushNetworkException.java +++ b/libsignal/src/main/java/org/session/libsignal/exceptions/PushNetworkException.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push.exceptions; +package org.session.libsignal.exceptions; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java b/libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java rename to libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java index 6a09521e4..f12f0d080 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/shared/SharedContact.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SharedContact.java @@ -1,7 +1,6 @@ -package org.session.libsignal.service.api.messages.shared; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.SignalServiceAttachment; import java.util.LinkedList; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java index 94bfc2fe2..d01d4e4ef 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachment.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachment.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java index e5d9641db..5e4c85853 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentPointer.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentPointer.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.service.api.SignalServiceMessageReceiver; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java index b4d27ee42..183bb9aab 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceAttachmentStream.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceAttachmentStream.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java index 96cc6c555..fe3a0a9df 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceContent.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceContent.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; import org.session.libsignal.protos.SignalServiceProtos; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java index 4d8331587..de9d8d9a3 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceDataMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceDataMessage.java @@ -4,11 +4,10 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsignal.service.api.messages.shared.SharedContact; -import org.session.libsignal.service.api.push.SignalServiceAddress; +import org.session.libsignal.utilities.SignalServiceAddress; import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage; import java.util.LinkedList; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java similarity index 96% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java index 1ddb46bf8..38d45694e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceEnvelope.java @@ -4,11 +4,11 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import com.google.protobuf.ByteString; -import org.session.libsignal.service.api.push.SignalServiceAddress; +import org.session.libsignal.utilities.SignalServiceAddress; import org.session.libsignal.protos.SignalServiceProtos.Envelope; /** diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java index 87285bc4f..6b38526c3 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceGroup.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceGroup.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java similarity index 93% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java index 83d891eb7..77371ab9e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceReceiptMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceReceiptMessage.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.messages; - +package org.session.libsignal.messages; import java.util.List; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java similarity index 92% rename from libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java rename to libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java index 81a4879ff..579b09437 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceTypingMessage.java +++ b/libsignal/src/main/java/org/session/libsignal/messages/SignalServiceTypingMessage.java @@ -1,4 +1,4 @@ -package org.session.libsignal.service.api.messages; +package org.session.libsignal.messages; public class SignalServiceTypingMessage { diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java index 3f159be2f..d920d8d73 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/SignalServiceMessageReceiver.java @@ -7,9 +7,9 @@ package org.session.libsignal.service.api; import org.session.libsignal.exceptions.InvalidMessageException; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; -import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer; -import org.session.libsignal.service.api.messages.SignalServiceDataMessage; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachmentPointer; +import org.session.libsignal.messages.SignalServiceDataMessage; import java.io.File; import java.io.IOException; diff --git a/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java index ee8b75093..4eb739368 100644 --- a/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/DigestingRequestBody.java @@ -1,6 +1,6 @@ package org.session.libsignal.streams; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java b/libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java similarity index 91% rename from libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java rename to libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java index 046df2959..529e16bee 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/util/StreamDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/streams/StreamDetails.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.api.util; - +package org.session.libsignal.streams; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java b/libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java index 5d04aafc4..df0f45cd1 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/ProfileAvatarData.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ProfileAvatarData.java @@ -1,5 +1,4 @@ -package org.session.libsignal.service.internal.push; - +package org.session.libsignal.utilities; import org.session.libsignal.streams.OutputStreamFactory; diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java b/libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java similarity index 89% rename from libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java rename to libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java index d02bd7b2c..b0a6cd54d 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushAttachmentData.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/PushAttachmentData.java @@ -4,9 +4,9 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.internal.push; +package org.session.libsignal.utilities; -import org.session.libsignal.service.api.messages.SignalServiceAttachment.ProgressListener; +import org.session.libsignal.messages.SignalServiceAttachment.ProgressListener; import org.session.libsignal.streams.OutputStreamFactory; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java b/libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java rename to libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java index 4033aef2e..031076a5e 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/push/SignalServiceAddress.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/SignalServiceAddress.java @@ -4,7 +4,7 @@ * Licensed according to the LICENSE file in this repository. */ -package org.session.libsignal.service.api.push; +package org.session.libsignal.utilities; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt similarity index 94% rename from libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt index 8c4f22854..af4a1f694 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/Snode.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.service.loki +package org.session.libsignal.utilities class Snode(val address: String, val port: Int, val publicKeySet: KeySet?) { val ip: String get() = address.removePrefix("https://")