From 4078a9c4b533a5005d20a7b6596d8495f6fc764d Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 16:03:47 +1000 Subject: [PATCH] Move files --- .../securesms/ApplicationContext.java | 2 +- .../securesms/BindableConversationItem.java | 2 +- .../securesms/MediaOverviewActivity.java | 2 +- .../securesms/MediaPreviewActivity.java | 4 ++-- .../securesms/MessageDetailsActivity.java | 4 ++-- .../MessageDetailsRecipientAdapter.java | 2 +- .../thoughtcrime/securesms/ShareActivity.java | 4 ++-- .../securesms/ShortcutLauncherActivity.java | 2 +- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/components/AvatarImageView.java | 10 +++++----- .../components/ConversationTypingView.java | 2 +- .../securesms/components/FromTextView.java | 2 +- .../securesms/components/InputPanel.java | 2 +- .../securesms/components/QuoteView.java | 4 ++-- .../components/TypingStatusSender.java | 2 +- .../securesms/contacts/ContactAccessor.java | 2 +- .../contacts/ContactsCursorLoader.java | 2 +- .../conversation/ConversationActivity.java | 10 +++++----- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../conversation/ConversationItem.java | 4 ++-- .../conversation/ConversationUpdateItem.java | 4 ++-- .../securesms/database/GroupDatabase.java | 5 ++--- .../securesms/database/MessagingDatabase.java | 6 +++--- .../securesms/database/MmsDatabase.java | 12 ++++++------ .../securesms/database/RecipientDatabase.java | 4 ++-- .../securesms/database/SmsDatabase.java | 6 +++--- .../thoughtcrime/securesms/database/Storage.kt | 6 +++--- .../securesms/database/ThreadDatabase.java | 8 ++++---- .../loaders/BucketedThreadMediaLoader.java | 2 +- .../database/loaders/PagingMediaLoader.java | 2 +- .../database/loaders/ThreadMediaLoader.java | 2 +- .../database/model/DisplayRecord.java | 2 +- .../database/model/MediaMmsMessageRecord.java | 6 +++--- .../database/model/MessageRecord.java | 6 +++--- .../database/model/MmsMessageRecord.java | 6 +++--- .../model/NotificationMmsMessageRecord.java | 6 +++--- .../database/model/SmsMessageRecord.java | 4 ++-- .../securesms/database/model/ThreadRecord.java | 2 +- .../securesms/glide/ContactPhotoFetcher.java | 2 +- .../securesms/glide/ContactPhotoLoader.java | 2 +- .../securesms/groups/GroupManager.java | 4 ++-- .../securesms/jobs/AvatarDownloadJob.java | 4 +--- .../jobs/RetrieveProfileAvatarJob.java | 6 ++---- .../activities/CreateClosedGroupActivity.kt | 4 ++-- .../activities/CreatePrivateChatActivity.kt | 5 ++--- .../loki/activities/EditClosedGroupActivity.kt | 2 +- .../EditClosedGroupMembersAdapter.kt | 2 +- .../loki/activities/JoinPublicChatActivity.kt | 4 ++-- .../loki/activities/QRCodeActivity.kt | 6 ++---- .../loki/activities/SelectContactsAdapter.kt | 2 +- .../loki/activities/SettingsActivity.kt | 2 +- .../loki/database/LokiThreadDatabase.kt | 2 +- .../loki/database/LokiUserDatabase.kt | 2 +- .../dialogs/ConversationOptionsBottomSheet.kt | 5 +---- .../fragments/ContactSelectionListAdapter.kt | 2 +- .../fragments/ContactSelectionListFragment.kt | 2 +- .../fragments/ContactSelectionListLoader.kt | 2 +- .../loki/protocol/ClosedGroupsProtocolV2.kt | 4 ++-- .../loki/protocol/SessionMetaProtocol.kt | 2 +- .../loki/utilities/ContactUtilities.kt | 2 +- .../loki/utilities/NotificationUtilities.kt | 2 +- .../loki/utilities/OpenGroupUtilities.kt | 2 +- .../securesms/loki/views/ProfilePictureView.kt | 4 ++-- .../securesms/loki/views/UserView.kt | 2 +- .../longmessage/LongMessageActivity.java | 2 +- .../mediasend/MediaPickerFolderFragment.java | 2 +- .../securesms/mediasend/MediaSendActivity.java | 2 +- .../securesms/mediasend/MediaSendFragment.java | 2 +- .../securesms/mms/AttachmentManager.java | 2 +- .../securesms/mms/SignalGlideModule.java | 2 +- .../AbstractNotificationBuilder.java | 4 ++-- .../AndroidAutoReplyReceiver.java | 2 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../FailedNotificationBuilder.java | 2 +- .../MultipleRecipientNotificationBuilder.java | 2 +- .../notifications/NotificationChannels.java | 4 ++-- .../notifications/NotificationItem.java | 2 +- .../notifications/NotificationState.java | 4 ++-- .../OptimizedMessageNotifier.java | 2 +- .../PendingMessageNotificationBuilder.java | 2 +- .../notifications/RemoteReplyReceiver.java | 2 +- .../securesms/notifications/ReplyMethod.java | 2 +- .../SingleRecipientNotificationBuilder.java | 8 ++++---- .../securesms/search/SearchRepository.java | 2 +- .../securesms/search/model/MessageResult.java | 2 +- .../securesms/search/model/SearchResult.java | 2 +- .../securesms/service/DirectShareService.java | 2 +- .../service/ExpiringMessageManager.java | 2 +- .../securesms/sskenvironment/ProfileManager.kt | 3 +-- .../sskenvironment/TypingStatusRepository.java | 2 +- .../securesms/util/CommunicationActions.java | 3 +-- .../{messaging => }/avatars/AvatarHelper.java | 2 +- .../{messaging => }/avatars/ContactColors.java | 2 +- .../{messaging => }/avatars/ContactPhoto.java | 2 +- .../avatars/FallbackContactPhoto.java | 2 +- .../avatars/GeneratedContactPhoto.java | 2 +- .../avatars/GroupRecordContactPhoto.java | 6 +++--- .../avatars/ProfileContactPhoto.java | 2 +- .../avatars/ResourceContactPhoto.java | 2 +- .../avatars/SystemContactPhoto.java | 2 +- .../avatars/TransparentContactPhoto.java | 2 +- .../{messaging => database}/StorageProtocol.kt | 6 +++--- .../messaging/MessagingModuleConfiguration.kt | 11 ++++++----- .../control/ClosedGroupControlMessage.kt | 2 +- .../OutgoingExpirationUpdateMessage.java | 4 ++-- .../signal/OutgoingGroupMediaMessage.java | 4 ++-- .../messages/signal/OutgoingMediaMessage.java | 8 ++++---- .../signal/OutgoingSecureMediaMessage.java | 2 +- .../messages/signal/OutgoingTextMessage.java | 2 +- .../messages/visible/VisibleMessage.kt | 2 +- .../ReceivedMessageHandler.kt | 4 ++-- .../notifications/MessageNotifier.kt | 2 +- .../threads => utilities}/DistributionTypes.kt | 2 +- .../documents => utilities}/Document.java | 2 +- .../threads => utilities}/GroupRecord.kt | 4 ++-- .../IdentityKeyMismatch.java | 2 +- .../IdentityKeyMismatchList.java | 2 +- .../NetworkFailure.java | 2 +- .../NetworkFailureList.java | 2 +- .../utilities/ProfilePictureModifiedEvent.kt | 2 +- .../libsession/utilities/SSKEnvironment.kt | 2 +- .../recipients/Recipient.java | 18 +++++++++--------- .../recipients/RecipientExporter.java | 2 +- .../RecipientFormattingException.java | 2 +- .../recipients/RecipientModifiedListener.java | 2 +- .../recipients/RecipientProvider.java | 12 ++++++------ 128 files changed, 210 insertions(+), 222 deletions(-) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/AvatarHelper.java (97%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/ContactColors.java (94%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/ContactPhoto.java (89%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/FallbackContactPhoto.java (83%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/GeneratedContactPhoto.java (98%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/GroupRecordContactPhoto.java (92%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/ProfileContactPhoto.java (96%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/ResourceContactPhoto.java (97%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/SystemContactPhoto.java (97%) rename libsession/src/main/java/org/session/libsession/{messaging => }/avatars/TransparentContactPhoto.java (91%) rename libsession/src/main/java/org/session/libsession/{messaging => database}/StorageProtocol.kt (98%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/DistributionTypes.kt (77%) rename libsession/src/main/java/org/session/libsession/{database/documents => utilities}/Document.java (68%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/GroupRecord.kt (92%) rename libsession/src/main/java/org/session/libsession/{database/documents => utilities}/IdentityKeyMismatch.java (98%) rename libsession/src/main/java/org/session/libsession/{database/documents => utilities}/IdentityKeyMismatchList.java (93%) rename libsession/src/main/java/org/session/libsession/{database/documents => utilities}/NetworkFailure.java (93%) rename libsession/src/main/java/org/session/libsession/{database/documents => utilities}/NetworkFailureList.java (93%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/recipients/Recipient.java (97%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/recipients/RecipientExporter.java (95%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/recipients/RecipientFormattingException.java (93%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/recipients/RecipientModifiedListener.java (61%) rename libsession/src/main/java/org/session/libsession/{messaging/threads => utilities}/recipients/RecipientProvider.java (96%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 0d30797ec..c0cf0f75a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -31,7 +31,7 @@ import androidx.multidex.MultiDexApplication; import org.conscrypt.Conscrypt; import org.session.libsession.messaging.MessagingModuleConfiguration; -import org.session.libsession.messaging.avatars.AvatarHelper; +import org.session.libsession.avatars.AvatarHelper; import org.session.libsession.messaging.file_server.FileServerAPI; import org.session.libsession.messaging.mentions.MentionsManager; import org.session.libsession.messaging.open_groups.OpenGroupAPI; diff --git a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java index dcd88d23f..defaee86b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java @@ -11,7 +11,7 @@ import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Locale; import java.util.Set; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java index 66482c9c5..96e092261 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -62,7 +62,7 @@ import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.Buc import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.permissions.Permissions; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.AttachmentUtil; import org.thoughtcrime.securesms.util.SaveAttachmentTask; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index ba2b2722c..c90d37f40 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -55,8 +55,8 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.components.MediaView; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index abed19ac2..a14d17293 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -60,8 +60,8 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.thoughtcrime.securesms.util.DateUtils; import org.session.libsession.utilities.ExpirationUtil; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java index 76c106f6d..e150c1656 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.loki.views.UserView; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.Conversions; import java.security.MessageDigest; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java index 68614fe92..4754de4b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java @@ -35,7 +35,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.Toolbar; -import org.session.libsession.messaging.threads.DistributionTypes; +import org.session.libsession.utilities.DistributionTypes; import org.thoughtcrime.securesms.components.SearchToolbar; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.session.libsession.messaging.threads.Address; @@ -46,7 +46,7 @@ import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListLoader.Disp import org.thoughtcrime.securesms.mediasend.Media; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.providers.BlobProvider; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java index d8e6db673..910ff55a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java @@ -12,7 +12,7 @@ import android.widget.Toast; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.loki.activities.HomeActivity; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.CommunicationActions; import network.loki.messenger.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index cd3d0641a..25c902800 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -12,7 +12,7 @@ import net.sqlcipher.database.SQLiteDatabase import org.greenrobot.eventbus.EventBus import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId -import org.session.libsession.messaging.avatars.AvatarHelper +import org.session.libsession.avatars.AvatarHelper import org.session.libsession.utilities.Conversions import org.thoughtcrime.securesms.backup.BackupProtos.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index b106ffd06..977d2d107 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.* import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.util.BackupUtil -import org.session.libsession.messaging.avatars.AvatarHelper +import org.session.libsession.avatars.AvatarHelper import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.Conversions diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java index 0152ac9e3..e568b59fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -23,12 +23,12 @@ import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.session.libsession.messaging.avatars.ContactColors; -import org.session.libsession.messaging.avatars.ContactPhoto; -import org.session.libsession.messaging.avatars.ResourceContactPhoto; +import org.session.libsession.avatars.ContactColors; +import org.session.libsession.avatars.ContactPhoto; +import org.session.libsession.avatars.ResourceContactPhoto; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientExporter; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientExporter; import org.session.libsession.utilities.ThemeUtil; import java.util.Objects; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java index 665949984..4246a79f3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java @@ -9,7 +9,7 @@ import android.view.View; import android.widget.LinearLayout; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.ThemeUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java index 407c5d7e4..c79705cd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java @@ -15,7 +15,7 @@ import android.util.AttributeSet; import network.loki.messenger.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.ResUtil; import org.session.libsession.utilities.color.spans.CenterAlignedRelativeSizeSpan; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index ec1a38c9c..9b05c269a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java @@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index 5a1710875..ce4f00c53 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java @@ -31,8 +31,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideDeck; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java index fc6208dbd..e3317ff1c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java @@ -9,7 +9,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.Util; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java index ea5b65e70..9b67bbfc4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java @@ -29,7 +29,7 @@ import java.util.List; import network.loki.messenger.R; -import org.session.libsession.messaging.threads.GroupRecord; +import org.session.libsession.utilities.GroupRecord; import org.session.libsession.utilities.TextSecurePreferences; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java index 8c5cbccba..ed38683eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java @@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsession.messaging.threads.GroupRecord; +import org.session.libsession.utilities.GroupRecord; import java.util.ArrayList; import java.util.List; 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 6762e6457..d7698c874 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -98,11 +98,11 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.DistributionTypes; -import org.session.libsession.messaging.threads.GroupRecord; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientFormattingException; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.DistributionTypes; +import org.session.libsession.utilities.GroupRecord; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientFormattingException; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.session.libsession.utilities.ExpirationUtil; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.MediaTypes; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index 5a2e459dd..8c7522a3f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -43,7 +43,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.SlideDeck; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.DateUtils; import org.thoughtcrime.securesms.util.LRUCache; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index ce0b17dad..1e5ffa9c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -71,7 +71,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 70c9caae8..47a520caa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -61,8 +61,8 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 194b9779c..3800f29da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java @@ -22,8 +22,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.DateUtils; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientModifiedListener; import org.session.libsession.utilities.ExpirationUtil; import org.session.libsession.utilities.Util; 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 871c2576c..ee31ea20a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -17,10 +17,9 @@ import net.sqlcipher.database.SQLiteDatabase; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.util.BitmapUtil; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.GroupRecord; -import org.session.libsession.utilities.GroupUtil; +import org.session.libsession.utilities.GroupRecord; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.guava.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java index 6509c1a9f..64bc99612 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java @@ -7,9 +7,9 @@ import android.text.TextUtils; import net.sqlcipher.database.SQLiteDatabase; -import org.session.libsession.database.documents.Document; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.IdentityKeyMismatchList; +import org.session.libsession.utilities.Document; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsignal.utilities.Log; import org.session.libsignal.crypto.IdentityKey; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 4493f778e..69bb0a8b3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -37,10 +37,10 @@ import org.json.JSONObject; import org.session.libsession.utilities.GroupUtil; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.attachments.MmsNotificationAttachment; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.IdentityKeyMismatchList; -import org.session.libsession.database.documents.NetworkFailure; -import org.session.libsession.database.documents.NetworkFailureList; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.IdentityKeyMismatchList; +import org.session.libsession.utilities.NetworkFailure; +import org.session.libsession.utilities.NetworkFailureList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; @@ -62,8 +62,8 @@ import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.RecipientFormattingException; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.RecipientFormattingException; import org.session.libsignal.utilities.JsonUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 4363250ec..a0f2fdbe6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -14,8 +14,8 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.Recipient.*; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient.*; import org.session.libsignal.utilities.Base64; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 43f374034..7c84273dc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -30,8 +30,8 @@ import net.sqlcipher.database.SQLiteStatement; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.IdentityKeyMismatchList; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.SmsMessageRecord; @@ -41,7 +41,7 @@ import org.session.libsession.messaging.messages.signal.IncomingTextMessage; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsignal.utilities.JsonUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; 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 f4a603c48..ed5b8b7b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database import android.content.Context import android.net.Uri import okhttp3.HttpUrl -import org.session.libsession.messaging.StorageProtocol +import org.session.libsession.database.StorageProtocol import org.session.libsession.messaging.jobs.AttachmentUploadJob import org.session.libsession.messaging.jobs.Job import org.session.libsession.messaging.jobs.JobQueue @@ -22,8 +22,8 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.Address.Companion.fromSerialized -import org.session.libsession.messaging.threads.GroupRecord -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.GroupRecord +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.messaging.utilities.UpdateMessageData import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.IdentityKeyUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index b5db0dbec..f95ced3da 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -30,12 +30,12 @@ import com.annimon.stream.Stream; import net.sqlcipher.database.SQLiteDatabase; -import org.session.libsession.messaging.threads.DistributionTypes; +import org.session.libsession.utilities.DistributionTypes; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.GroupRecord; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings; +import org.session.libsession.utilities.GroupRecord; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient.RecipientSettings; import org.session.libsession.utilities.DelimiterUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java index a367b23aa..67d6fa34f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java @@ -13,7 +13,7 @@ import network.loki.messenger.R; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MediaDatabase; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java index 0f17ddb39..0247c54c9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java @@ -12,7 +12,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.mms.PartAuthority; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.AsyncLoader; public class PagingMediaLoader extends AsyncLoader> { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java index 91ed7332d..fe2054948 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.AbstractCursorLoader; public class ThreadMediaLoader extends AbstractCursorLoader { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java index 35a10fce3..f592d47e9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java @@ -22,7 +22,7 @@ import android.text.SpannableString; import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SmsDatabase; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; /** * The base class for all message record models. Encapsulates basic data diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java index f67dacb56..222cd5e65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java @@ -26,10 +26,10 @@ import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase.Status; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.NetworkFailure; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.NetworkFailure; import org.thoughtcrime.securesms.mms.SlideDeck; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java index 441b6cb98..13a9b4911 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -30,10 +30,10 @@ import org.session.libsession.messaging.utilities.UpdateMessageBuilder; import org.session.libsession.messaging.utilities.UpdateMessageData; import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SmsDatabase; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.NetworkFailure; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.NetworkFailure; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java index 0bfd33098..012bfc092 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java @@ -6,10 +6,10 @@ import androidx.annotation.Nullable; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.NetworkFailure; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.NetworkFailure; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java index 523aa0ad8..361be34d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java @@ -23,10 +23,10 @@ import android.text.SpannableString; import network.loki.messenger.R; import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase.Status; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.NetworkFailure; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.NetworkFailure; import org.thoughtcrime.securesms.mms.SlideDeck; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Collections; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java index 9faabc77c..08328aaae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java @@ -24,8 +24,8 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SmsDatabase; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.recipients.Recipient; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java index 1833ac427..c5091651a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -27,7 +27,7 @@ import android.text.style.StyleSpan; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.ExpirationUtil; import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SmsDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java index aef373868..6ab528b78 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java @@ -8,7 +8,7 @@ import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; -import org.session.libsession.messaging.avatars.ContactPhoto; +import org.session.libsession.avatars.ContactPhoto; import java.io.IOException; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java index c25339652..61a89c0bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java @@ -9,7 +9,7 @@ import com.bumptech.glide.load.model.ModelLoader; import com.bumptech.glide.load.model.ModelLoaderFactory; import com.bumptech.glide.load.model.MultiModelLoaderFactory; -import org.session.libsession.messaging.avatars.ContactPhoto; +import org.session.libsession.avatars.ContactPhoto; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java index 69988b656..700db60ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java @@ -7,8 +7,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.DistributionTypes; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.DistributionTypes; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.TextSecurePreferences; 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 d5ce693b6..1c7bf1142 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -8,7 +8,7 @@ import org.session.libsession.utilities.DownloadUtilities; import org.session.libsignal.streams.AttachmentCipherInputStream; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase; -import org.session.libsession.messaging.threads.GroupRecord; +import org.session.libsession.utilities.GroupRecord; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; @@ -27,8 +27,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import javax.inject.Inject; - public class AvatarDownloadJob extends BaseJob implements InjectableType { public static final String KEY = "AvatarDownloadJob"; 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 a310eca3d..614b1084d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -5,10 +5,10 @@ import android.text.TextUtils; import androidx.annotation.NonNull; -import org.session.libsession.messaging.avatars.AvatarHelper; +import org.session.libsession.avatars.AvatarHelper; import org.session.libsession.messaging.utilities.Data; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.DownloadUtilities; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; @@ -29,8 +29,6 @@ import java.io.InputStream; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - public class RetrieveProfileAvatarJob extends BaseJob implements InjectableType { public static final String KEY = "RetrieveProfileAvatarJob"; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt index f9bacaff2..17ba18554 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt @@ -19,12 +19,12 @@ import org.session.libsession.messaging.sending_receiving.groupSizeLimit import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.DistributionTypes +import org.session.libsession.utilities.DistributionTypes import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.utilities.fadeIn import org.thoughtcrime.securesms.loki.utilities.fadeOut import org.thoughtcrime.securesms.mms.GlideApp -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences //TODO Refactor to avoid using kotlinx.android.synthetic 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 ba3b623a8..4fb93a53b 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 @@ -18,12 +18,11 @@ import network.loki.messenger.R import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.DistributionTypes +import org.session.libsession.utilities.DistributionTypes import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.ThreadDatabase 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.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.PublicKeyValidation 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 3bb10b009..385af011d 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 @@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSh import org.thoughtcrime.securesms.loki.utilities.fadeIn import org.thoughtcrime.securesms.loki.utilities.fadeOut import org.thoughtcrime.securesms.mms.GlideApp -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.ThemeUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt index 7d5ed3408..123e2ca97 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.loki.views.UserView import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences class EditClosedGroupMembersAdapter( diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt index 7527b68c4..4d7065053 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt @@ -25,8 +25,8 @@ import network.loki.messenger.R import okhttp3.HttpUrl import org.session.libsession.messaging.open_groups.OpenGroupAPIV2.DefaultGroup import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.DistributionTypes -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.DistributionTypes +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.BaseActionBarActivity 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 bedd1f312..dc65b0d33 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 @@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Intent import android.graphics.Bitmap -import android.net.Uri import android.os.Bundle import android.os.Environment import android.view.LayoutInflater @@ -17,14 +16,13 @@ import network.loki.messenger.R import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.DistributionTypes +import org.session.libsession.utilities.DistributionTypes import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.ThreadDatabase import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate import org.thoughtcrime.securesms.loki.utilities.QRCodeUtilities import org.thoughtcrime.securesms.loki.utilities.toPx -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.util.FileProviderUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.PublicKeyValidation diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt index e8bbede27..d8e8d1721 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt @@ -6,7 +6,7 @@ import android.view.ViewGroup import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.loki.views.UserView import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient class SelectContactsAdapter(private val context: Context, private val glide: GlideRequests) : RecyclerView.Adapter() { val selectedMembers = mutableSetOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt index 6c6d95511..0d0e96ac4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt @@ -25,7 +25,7 @@ import nl.komponents.kovenant.Promise import nl.komponents.kovenant.all import nl.komponents.kovenant.ui.alwaysUi import nl.komponents.kovenant.ui.successUi -import org.session.libsession.messaging.avatars.AvatarHelper +import org.session.libsession.avatars.AvatarHelper import org.session.libsession.messaging.open_groups.OpenGroupAPI import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.ProfilePictureUtilities diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt index 68ca31cea..63098e4db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.loki.utilities.* import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsignal.utilities.JsonUtil 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 6b9c1cc32..33138449f 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 @@ -9,7 +9,7 @@ import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper 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.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.database.LokiUserDatabaseProtocol diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt index e6ee83162..9c7b51f31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt @@ -5,12 +5,9 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.appcompat.view.ContextThemeWrapper -import kotlinx.android.synthetic.main.fragment_closed_group_edit_bottom_sheet.* import kotlinx.android.synthetic.main.fragment_conversation_bottom_sheet.* -import kotlinx.android.synthetic.main.fragment_device_list_bottom_sheet.* import network.loki.messenger.R -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt index 802b2f4f1..ba039009b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt @@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.contact_selection_list_divider.view.* import network.loki.messenger.R import org.thoughtcrime.securesms.loki.views.UserView import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient class ContactSelectionListAdapter(private val context: Context, private val multiSelect: Boolean) : RecyclerView.Adapter() { lateinit var glide: GlideRequests diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt index 063dbc30c..8a68d4e3b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt @@ -14,7 +14,7 @@ import network.loki.messenger.R import org.thoughtcrime.securesms.contacts.ContactsCursorLoader import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.mms.GlideApp -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient class ContactSelectionListFragment : Fragment(), LoaderManager.LoaderCallbacks>, ContactClickListener { private var cursorFilter: String? = null diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt index 6e46808d4..8eab5b3a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.fragments import android.content.Context import network.loki.messenger.R import org.thoughtcrime.securesms.loki.utilities.ContactUtilities -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.util.AsyncLoader sealed class ContactSelectionListItem { 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 b3f5b1892..a661884c7 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 @@ -19,8 +19,8 @@ import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGro import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.GroupRecord -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.GroupRecord +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences 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 3886ce823..374b3e333 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 @@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.ApplicationContext import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.messages.SignalServiceContent import org.session.libsignal.messages.SignalServiceDataMessage diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt index bab2fdfb5..39a5c68c6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.utilities import android.content.Context import org.thoughtcrime.securesms.database.DatabaseFactory -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient object ContactUtilities { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt index ca0e711d9..7db784d8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/NotificationUtilities.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.utilities import android.content.Context import org.thoughtcrime.securesms.database.DatabaseFactory -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, context: Context): String { val threadID = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(threadRecipient) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt index 66d726374..31dacd888 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.open_groups.OpenGroup import org.session.libsession.messaging.open_groups.OpenGroupAPI import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 import org.session.libsession.messaging.open_groups.OpenGroupV2 -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.TextSecurePreferences import org.session.libsession.utilities.preferences.ProfileKeyUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt index acfa2470d..68188a06a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt @@ -10,10 +10,10 @@ import androidx.annotation.DimenRes import com.bumptech.glide.load.engine.DiskCacheStrategy import kotlinx.android.synthetic.main.view_profile_picture.view.* import network.loki.messenger.R -import org.session.libsession.messaging.avatars.ProfileContactPhoto +import org.session.libsession.avatars.ProfileContactPhoto import org.session.libsession.messaging.mentions.MentionsManager import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt index 19642a6c8..193bd1bd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/UserView.kt @@ -11,7 +11,7 @@ import network.loki.messenger.R import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities import org.thoughtcrime.securesms.mms.GlideRequests -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient class UserView : LinearLayout { var openGroupThreadID: Long = -1 // FIXME: This is a bit ugly diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java index 2c37a56ea..50e71cead 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.components.ConversationItemFooter; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java index ff1248a67..b64e837b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java @@ -20,7 +20,7 @@ import android.view.ViewGroup; import android.view.WindowManager; import org.thoughtcrime.securesms.mms.GlideApp; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsignal.utilities.guava.Optional; import network.loki.messenger.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 73fe91681..49840795e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.concurrent.SimpleTask; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 91820bf40..481234e74 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -42,7 +42,7 @@ import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.providers.BlobProvider; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; import org.thoughtcrime.securesms.util.PushCharacterCalculator; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index f172f2315..c6e24adfd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -54,7 +54,7 @@ import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java index 1d03cfb2f..e49b2333d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.java @@ -20,7 +20,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable; import com.bumptech.glide.load.resource.gif.StreamGifDecoder; import com.bumptech.glide.module.AppGlideModule; -import org.session.libsession.messaging.avatars.ContactPhoto; +import org.session.libsession.avatars.ContactPhoto; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index 204c48913..b1089b8fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -12,8 +12,8 @@ import android.text.TextUtils; import network.loki.messenger.R; import org.session.libsession.utilities.preferences.NotificationPrivacyPreference; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.Recipient.*; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient.*; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index e0d600e99..363abf8ae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.mms.MmsException; import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.session.libsignal.utilities.Log; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index a0770d2d7..6375bc64a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -41,7 +41,7 @@ import androidx.core.app.NotificationManagerCompat; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java index 333d00e00..f2ca8258e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java @@ -6,7 +6,7 @@ import android.content.Intent; import android.graphics.BitmapFactory; import network.loki.messenger.R; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.preferences.NotificationPrivacyPreference; public class FailedNotificationBuilder extends AbstractNotificationBuilder { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java index ef285d1bb..5430a4977 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java @@ -12,7 +12,7 @@ import android.text.SpannableStringBuilder; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities; import org.session.libsession.utilities.preferences.NotificationPrivacyPreference; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java index 335e857c2..1e12a8dbc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java @@ -25,8 +25,8 @@ import network.loki.messenger.R; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.Recipient.*; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient.*; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.utilities.Log; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java index 63b11231c..e92f62aa4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationItem.java @@ -10,7 +10,7 @@ import androidx.core.app.TaskStackBuilder; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.mms.SlideDeck; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; public class NotificationItem { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java index dc000650d..9330ec9e3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -10,8 +10,8 @@ import androidx.annotation.Nullable; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.conversation.ConversationPopupActivity; import org.session.libsignal.utilities.Log; -import org.session.libsession.messaging.threads.recipients.Recipient; -import org.session.libsession.messaging.threads.recipients.Recipient.*; +import org.session.libsession.utilities.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient.*; import java.util.LinkedHashSet; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java index 02250be31..fcf7eb0a3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; import org.session.libsession.messaging.sending_receiving.pollers.Poller; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.Debouncer; import org.session.libsignal.utilities.ThreadUtils; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java index 10d1435c1..ac6ace370 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import androidx.core.app.NotificationCompat; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.session.libsession.utilities.preferences.NotificationPrivacyPreference; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index d6100876b..0d0736b56 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.mms.MmsException; import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java index 577f02962..be2ab1d31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/ReplyMethod.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.notifications; import android.content.Context; import androidx.annotation.NonNull; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; public enum ReplyMethod { diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index c777d507d..9e59ee38f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -25,9 +25,9 @@ import androidx.core.app.RemoteInput; import com.bumptech.glide.load.engine.DiskCacheStrategy; -import org.session.libsession.messaging.avatars.ContactColors; -import org.session.libsession.messaging.avatars.ContactPhoto; -import org.session.libsession.messaging.avatars.GeneratedContactPhoto; +import org.session.libsession.avatars.ContactColors; +import org.session.libsession.avatars.ContactPhoto; +import org.session.libsession.avatars.GeneratedContactPhoto; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities; @@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideDeck; import org.session.libsession.utilities.preferences.NotificationPrivacyPreference; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.BitmapUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java index 6ff68b87e..c13e1a589 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java @@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.session.libsignal.utilities.Log; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.search.model.MessageResult; import org.thoughtcrime.securesms.search.model.SearchResult; import org.thoughtcrime.securesms.util.Stopwatch; diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java b/app/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java index 96daeb317..4523ab364 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/model/MessageResult.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.search.model; import androidx.annotation.NonNull; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; /** * Represents a search result for a message. diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java b/app/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java index 2bcab9f0f..c1e40beb4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/model/SearchResult.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.CursorList; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java index 7fe08f764..ba8d7078f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.util.BitmapUtil; import java.util.LinkedList; 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 31782f244..9d2339029 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull; import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate; import org.session.libsession.messaging.messages.signal.OutgoingExpirationUpdateMessage; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.GroupUtil; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt index 53781d1ab..ae98e00cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ProfileManager.kt @@ -1,11 +1,10 @@ package org.thoughtcrime.securesms.sskenvironment import android.content.Context -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.SSKEnvironment import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.RecipientDatabase import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob class ProfileManager: SSKEnvironment.ProfileManagerProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java index 1bb1b5243..ad9833b8c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java @@ -11,7 +11,7 @@ import com.annimon.stream.Stream; import org.jetbrains.annotations.NotNull; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java index 2487d8dba..418de713c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java @@ -14,9 +14,8 @@ import android.widget.Toast; import org.thoughtcrime.securesms.conversation.ConversationActivity; import network.loki.messenger.R; -import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; public class CommunicationActions { diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/AvatarHelper.java b/libsession/src/main/java/org/session/libsession/avatars/AvatarHelper.java similarity index 97% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/AvatarHelper.java rename to libsession/src/main/java/org/session/libsession/avatars/AvatarHelper.java index aad0051bb..1fe9f684f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/AvatarHelper.java +++ b/libsession/src/main/java/org/session/libsession/avatars/AvatarHelper.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColors.java b/libsession/src/main/java/org/session/libsession/avatars/ContactColors.java similarity index 94% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColors.java rename to libsession/src/main/java/org/session/libsession/avatars/ContactColors.java index 8c118cd97..b6ac9811d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/ContactColors.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ContactColors.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import androidx.annotation.NonNull; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/ContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/ContactPhoto.java similarity index 89% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/ContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/ContactPhoto.java index e11eb5f36..0d256fd38 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/ContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.net.Uri; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/FallbackContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/FallbackContactPhoto.java similarity index 83% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/FallbackContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/FallbackContactPhoto.java index c21c0438b..b2095c598 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/FallbackContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/FallbackContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/GeneratedContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/GeneratedContactPhoto.java similarity index 98% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/GeneratedContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/GeneratedContactPhoto.java index d3be9cfbf..0f607d6e3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/GeneratedContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/GeneratedContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.graphics.Color; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/GroupRecordContactPhoto.java similarity index 92% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/GroupRecordContactPhoto.java index dde2a633f..f2cb3b1e3 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/GroupRecordContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/GroupRecordContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.net.Uri; @@ -7,9 +7,9 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.MessagingModuleConfiguration; -import org.session.libsession.messaging.StorageProtocol; +import org.session.libsession.database.StorageProtocol; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.GroupRecord; +import org.session.libsession.utilities.GroupRecord; import org.session.libsession.utilities.Conversions; import org.session.libsignal.utilities.guava.Optional; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/ProfileContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/ProfileContactPhoto.java similarity index 96% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/ProfileContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/ProfileContactPhoto.java index 19109b86a..d614c5e0f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/ProfileContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ProfileContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.net.Uri; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/ResourceContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java similarity index 97% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/ResourceContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java index b419b075e..2bcd32ac2 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/ResourceContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/ResourceContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.graphics.Color; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/SystemContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/SystemContactPhoto.java similarity index 97% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/SystemContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/SystemContactPhoto.java index 002a61de9..e29df14f1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/SystemContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/SystemContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.net.Uri; diff --git a/libsession/src/main/java/org/session/libsession/messaging/avatars/TransparentContactPhoto.java b/libsession/src/main/java/org/session/libsession/avatars/TransparentContactPhoto.java similarity index 91% rename from libsession/src/main/java/org/session/libsession/messaging/avatars/TransparentContactPhoto.java rename to libsession/src/main/java/org/session/libsession/avatars/TransparentContactPhoto.java index 619593b0c..56f2757e1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/avatars/TransparentContactPhoto.java +++ b/libsession/src/main/java/org/session/libsession/avatars/TransparentContactPhoto.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.avatars; +package org.session.libsession.avatars; import android.content.Context; import android.graphics.drawable.Drawable; diff --git a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt similarity index 98% rename from libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt rename to libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt index ba711f4ad..af1093336 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt +++ b/libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt @@ -1,4 +1,4 @@ -package org.session.libsession.messaging +package org.session.libsession.database import android.content.Context @@ -17,8 +17,8 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.GroupRecord -import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings +import org.session.libsession.utilities.GroupRecord +import org.session.libsession.utilities.recipients.Recipient.RecipientSettings import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.messages.SignalServiceAttachmentPointer import org.session.libsignal.messages.SignalServiceGroup diff --git a/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt b/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt index 98a958833..20b8d49d1 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt @@ -2,19 +2,20 @@ package org.session.libsession.messaging import android.content.Context import org.session.libsession.database.MessageDataProvider +import org.session.libsession.database.StorageProtocol class MessagingModuleConfiguration( - val context: Context, - val storage: StorageProtocol, - val messageDataProvider: MessageDataProvider + val context: Context, + val storage: StorageProtocol, + val messageDataProvider: MessageDataProvider ) { companion object { lateinit var shared: MessagingModuleConfiguration fun configure(context: Context, - storage: StorageProtocol, - messageDataProvider: MessageDataProvider + storage: StorageProtocol, + messageDataProvider: MessageDataProvider ) { if (Companion::shared.isInitialized) { return } shared = MessagingModuleConfiguration(context, storage, messageDataProvider) 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 0a393608f..41345ea26 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 @@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages.control import com.google.protobuf.ByteString import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsignal.crypto.ecc.DjbECPrivateKey import org.session.libsignal.crypto.ecc.DjbECPublicKey diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java index b45f33c78..fe1a4ff00 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java @@ -1,8 +1,8 @@ package org.session.libsession.messaging.messages.signal; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; -import org.session.libsession.messaging.threads.DistributionTypes; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.DistributionTypes; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Collections; import java.util.LinkedList; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java index d8a213cfc..f4d2b4a96 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java @@ -3,12 +3,12 @@ package org.session.libsession.messaging.messages.signal; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsession.messaging.threads.DistributionTypes; +import org.session.libsession.utilities.DistributionTypes; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.LinkedList; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java index b056bd0c1..b76484bbd 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java @@ -4,14 +4,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.messages.visible.VisibleMessage; -import org.session.libsession.messaging.threads.DistributionTypes; -import org.session.libsession.database.documents.IdentityKeyMismatch; -import org.session.libsession.database.documents.NetworkFailure; +import org.session.libsession.utilities.DistributionTypes; +import org.session.libsession.utilities.IdentityKeyMismatch; +import org.session.libsession.utilities.NetworkFailure; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Collections; import java.util.LinkedList; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java index f07991470..fcb334e3e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact; import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview; import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import java.util.Collections; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java index ac5b24040..abc39b662 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.java @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.signal; import org.session.libsession.messaging.messages.visible.OpenGroupInvitation; import org.session.libsession.messaging.messages.visible.VisibleMessage; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.messaging.utilities.UpdateMessageData; public class OutgoingTextMessage { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 08451f9c3..6f4067c55 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -5,7 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsignal.protos.SignalServiceProtos 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 d0b012db1..83eec2946 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 @@ -14,8 +14,8 @@ import org.session.libsession.messaging.sending_receiving.link_preview.LinkPrevi import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.GroupRecord -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.GroupRecord +import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.TextSecurePreferences diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt index 4a7889b75..4f820c4a9 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/MessageNotifier.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.sending_receiving.notifications import android.content.Context -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient interface MessageNotifier { fun setVisibleThread(threadId: Long) diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/DistributionTypes.kt b/libsession/src/main/java/org/session/libsession/utilities/DistributionTypes.kt similarity index 77% rename from libsession/src/main/java/org/session/libsession/messaging/threads/DistributionTypes.kt rename to libsession/src/main/java/org/session/libsession/utilities/DistributionTypes.kt index e71b83b0d..c6e8fcfd9 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/DistributionTypes.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/DistributionTypes.kt @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.threads +package org.session.libsession.utilities object DistributionTypes { const val DEFAULT = 2 diff --git a/libsession/src/main/java/org/session/libsession/database/documents/Document.java b/libsession/src/main/java/org/session/libsession/utilities/Document.java similarity index 68% rename from libsession/src/main/java/org/session/libsession/database/documents/Document.java rename to libsession/src/main/java/org/session/libsession/utilities/Document.java index 2167e0ee2..572f55ecf 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/Document.java +++ b/libsession/src/main/java/org/session/libsession/utilities/Document.java @@ -1,4 +1,4 @@ -package org.session.libsession.database.documents; +package org.session.libsession.utilities; import java.util.List; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/GroupRecord.kt b/libsession/src/main/java/org/session/libsession/utilities/GroupRecord.kt similarity index 92% rename from libsession/src/main/java/org/session/libsession/messaging/threads/GroupRecord.kt rename to libsession/src/main/java/org/session/libsession/utilities/GroupRecord.kt index 5e6750b5e..3be8f4b69 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/GroupRecord.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/GroupRecord.kt @@ -1,7 +1,7 @@ -package org.session.libsession.messaging.threads +package org.session.libsession.utilities import android.text.TextUtils -import org.session.libsession.utilities.GroupUtil +import org.session.libsession.messaging.threads.Address import java.io.IOException import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatch.java similarity index 98% rename from libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java rename to libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatch.java index 01ee2e306..ceb59d140 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatch.java @@ -1,4 +1,4 @@ -package org.session.libsession.database.documents; +package org.session.libsession.utilities; import org.session.libsignal.utilities.Log; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatchList.java b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatchList.java similarity index 93% rename from libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatchList.java rename to libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatchList.java index e270522de..e1ea2d26e 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatchList.java +++ b/libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatchList.java @@ -1,4 +1,4 @@ -package org.session.libsession.database.documents; +package org.session.libsession.utilities; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/NetworkFailure.java b/libsession/src/main/java/org/session/libsession/utilities/NetworkFailure.java similarity index 93% rename from libsession/src/main/java/org/session/libsession/database/documents/NetworkFailure.java rename to libsession/src/main/java/org/session/libsession/utilities/NetworkFailure.java index 993cf6f83..f4bfb9154 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/NetworkFailure.java +++ b/libsession/src/main/java/org/session/libsession/utilities/NetworkFailure.java @@ -1,4 +1,4 @@ -package org.session.libsession.database.documents; +package org.session.libsession.utilities; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/NetworkFailureList.java b/libsession/src/main/java/org/session/libsession/utilities/NetworkFailureList.java similarity index 93% rename from libsession/src/main/java/org/session/libsession/database/documents/NetworkFailureList.java rename to libsession/src/main/java/org/session/libsession/utilities/NetworkFailureList.java index 9fdea4d7d..ef5faa646 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/NetworkFailureList.java +++ b/libsession/src/main/java/org/session/libsession/utilities/NetworkFailureList.java @@ -1,4 +1,4 @@ -package org.session.libsession.database.documents; +package org.session.libsession.utilities; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureModifiedEvent.kt b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureModifiedEvent.kt index 1bfe44325..f06ca2ec0 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureModifiedEvent.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/ProfilePictureModifiedEvent.kt @@ -1,5 +1,5 @@ package org.session.libsession.utilities -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient data class ProfilePictureModifiedEvent(val recipient: Recipient) \ No newline at end of file diff --git a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt index b0b1b730f..766f8b3ea 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/SSKEnvironment.kt @@ -4,7 +4,7 @@ import android.content.Context import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier import org.session.libsession.messaging.threads.Address -import org.session.libsession.messaging.threads.recipients.Recipient +import org.session.libsession.utilities.recipients.Recipient class SSKEnvironment( val typingIndicators: TypingIndicatorsProtocol, diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java similarity index 97% rename from libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java rename to libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java index 15c2d52f0..1dc689cad 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.session.libsession.messaging.threads.recipients; +package org.session.libsession.utilities.recipients; import android.content.Context; import android.graphics.drawable.Drawable; @@ -29,20 +29,20 @@ import com.annimon.stream.function.Consumer; import org.greenrobot.eventbus.EventBus; import org.session.libsession.messaging.MessagingModuleConfiguration; -import org.session.libsession.messaging.avatars.TransparentContactPhoto; +import org.session.libsession.avatars.TransparentContactPhoto; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.GroupRecord; -import org.session.libsession.messaging.threads.recipients.RecipientProvider.RecipientDetails; +import org.session.libsession.utilities.GroupRecord; +import org.session.libsession.utilities.recipients.RecipientProvider.RecipientDetails; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.guava.Optional; -import org.session.libsession.messaging.avatars.ContactColors; -import org.session.libsession.messaging.avatars.ContactPhoto; -import org.session.libsession.messaging.avatars.GroupRecordContactPhoto; -import org.session.libsession.messaging.avatars.ProfileContactPhoto; -import org.session.libsession.messaging.avatars.SystemContactPhoto; +import org.session.libsession.avatars.ContactColors; +import org.session.libsession.avatars.ContactPhoto; +import org.session.libsession.avatars.GroupRecordContactPhoto; +import org.session.libsession.avatars.ProfileContactPhoto; +import org.session.libsession.avatars.SystemContactPhoto; import org.session.libsession.utilities.ProfilePictureModifiedEvent; import org.session.libsession.utilities.FutureTaskListener; import org.session.libsession.utilities.ListenableFutureTask; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientExporter.java similarity index 95% rename from libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java rename to libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientExporter.java index 1b6b21f30..b41c4124b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientExporter.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientExporter.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.threads.recipients; +package org.session.libsession.utilities.recipients; import android.content.Intent; import android.provider.ContactsContract; diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientFormattingException.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientFormattingException.java similarity index 93% rename from libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientFormattingException.java rename to libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientFormattingException.java index 2bf8910f3..514c93da5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientFormattingException.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientFormattingException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.session.libsession.messaging.threads.recipients; +package org.session.libsession.utilities.recipients; public class RecipientFormattingException extends Exception { public RecipientFormattingException(String message) { diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientModifiedListener.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientModifiedListener.java similarity index 61% rename from libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientModifiedListener.java rename to libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientModifiedListener.java index e3f1b3355..a537f8fdc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientModifiedListener.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientModifiedListener.java @@ -1,4 +1,4 @@ -package org.session.libsession.messaging.threads.recipients; +package org.session.libsession.utilities.recipients; public interface RecipientModifiedListener { diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java similarity index 96% rename from libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java rename to libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java index a5b77d5d0..1e39d9c80 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/RecipientProvider.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.session.libsession.messaging.threads.recipients; +package org.session.libsession.utilities.recipients; import android.content.Context; import android.net.Uri; @@ -27,11 +27,11 @@ import org.session.libsession.messaging.MessagingModuleConfiguration; import org.session.libsignal.utilities.guava.Optional; import org.session.libsession.utilities.color.MaterialColor; import org.session.libsession.messaging.threads.Address; -import org.session.libsession.messaging.threads.GroupRecord; -import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings; -import org.session.libsession.messaging.threads.recipients.Recipient.RegisteredState; -import org.session.libsession.messaging.threads.recipients.Recipient.UnidentifiedAccessMode; -import org.session.libsession.messaging.threads.recipients.Recipient.VibrateState; +import org.session.libsession.utilities.GroupRecord; +import org.session.libsession.utilities.recipients.Recipient.RecipientSettings; +import org.session.libsession.utilities.recipients.Recipient.RegisteredState; +import org.session.libsession.utilities.recipients.Recipient.UnidentifiedAccessMode; +import org.session.libsession.utilities.recipients.Recipient.VibrateState; import org.session.libsession.utilities.ListenableFutureTask; import org.session.libsession.utilities.SoftHashMap; import org.session.libsession.utilities.TextSecurePreferences;