Move files

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -38,7 +38,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupAPI;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.snode.SnodeModule;
 import org.session.libsession.utilities.IdentityKeyUtil;
 import org.session.libsession.utilities.ProfilePictureUtilities;
@@ -47,7 +47,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
-import org.session.libsession.utilities.preferences.ProfileKeyUtil;
+import org.session.libsession.utilities.ProfileKeyUtil;
 import org.session.libsignal.database.LokiAPIDatabaseProtocol;
 import org.session.libsignal.utilities.ThreadUtils;
 import org.session.libsignal.utilities.Log;

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 
 import java.util.Locale;

app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java

@@ -54,7 +54,7 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.session.libsession.messaging.messages.control.DataExtractionNotification;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -54,7 +54,7 @@ import androidx.recyclerview.widget.RecyclerView;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java

@@ -45,7 +45,7 @@ import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
 import org.thoughtcrime.securesms.conversation.ConversationItem;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;

app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java

@@ -38,7 +38,7 @@ import androidx.appcompat.widget.Toolbar;
 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;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment;

app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java

@@ -10,7 +10,7 @@ import androidx.core.app.TaskStackBuilder;
 import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt

@@ -7,7 +7,7 @@ import org.greenrobot.eventbus.EventBus
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.attachments.*
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsession.utilities.Util
 import org.session.libsignal.utilities.guava.Optional

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.util.BackupUtil
 
 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.Address
 import org.session.libsession.utilities.Conversions
 import org.session.libsession.utilities.Util
 import org.session.libsignal.crypto.kdf.HKDFv3

app/src/main/java/org/thoughtcrime/securesms/components/AlbumThumbnailView.java

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 
 import java.util.List;
 

app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.RecipientExporter;
 import org.session.libsession.utilities.ThemeUtil;

app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java

@@ -17,7 +17,7 @@ import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;
-import org.session.libsession.utilities.color.spans.CenterAlignedRelativeSizeSpan;
+import org.session.libsession.utilities.CenterAlignedRelativeSizeSpan;
 
 public class FromTextView extends EmojiTextView {
 

app/src/main/java/org/thoughtcrime/securesms/components/MediaView.java

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.video.VideoPlayer;
 
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 
 import java.io.IOException;
 

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java

@@ -11,8 +11,8 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import static org.session.libsession.messaging.sending_receiving.sharecontacts.Contact.*;
+import static org.session.libsession.utilities.Contact.*;
 
 public class ContactModelMapper {
 

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java

@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
 import org.thoughtcrime.securesms.util.SpanUtil;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -96,8 +96,8 @@ 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.sending_receiving.quotes.QuoteModel;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.DistributionTypes;
 import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.recipients.Recipient;
@@ -111,7 +111,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 import org.session.libsignal.exceptions.InvalidMessageException;
 import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsession.messaging.mentions.Mention;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -70,7 +70,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -69,7 +69,7 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.ThemeUtil;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 import org.session.libsignal.utilities.guava.Optional;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.BindableConversationItem;

app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.database;
 
 import org.session.libsignal.utilities.Log;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.util.LRUCache;
 
 import java.util.HashMap;

app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 
 import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.Util;
 

app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java

@@ -10,7 +10,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 
 import java.util.LinkedList;
 import java.util.List;

app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 

app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.session.libsignal.utilities.Log;
 import org.session.libsignal.crypto.IdentityKey;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsignal.utilities.JsonUtil;
 
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -58,10 +58,10 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId;
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.RecipientFormattingException;
 import org.session.libsignal.utilities.JsonUtil;

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java

@@ -25,7 +25,7 @@ import androidx.annotation.Nullable;
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteQueryBuilder;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.Util;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -12,8 +12,8 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.Recipient.*;
 import org.session.libsignal.utilities.Base64;

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -40,7 +40,7 @@ import org.session.libsession.messaging.messages.signal.IncomingGroupMessage;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -20,15 +20,15 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 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.utilities.Address
-import org.session.libsession.messaging.threads.Address.Companion.fromSerialized
+import org.session.libsession.utilities.Address.Companion.fromSerialized
 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
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsession.utilities.ProfileKeyUtil
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.utilities.KeyHelper
 import org.session.libsignal.utilities.guava.Optional

app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -31,8 +31,8 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.session.libsession.utilities.DistributionTypes;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.Recipient.RecipientSettings;

app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java

@@ -10,7 +10,7 @@ import androidx.loader.content.AsyncTaskLoader;
 import com.annimon.stream.Stream;
 
 import network.loki.messenger.R;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.session.libsession.utilities.recipients.Recipient;

app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.database.Cursor;
 import androidx.annotation.NonNull;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;

app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java

@@ -22,7 +22,7 @@ import androidx.annotation.Nullable;
 import android.text.SpannableString;
 
 import network.loki.messenger.R;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase.Status;

app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java

@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.utilities.recipients.Recipient;
 

app/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java

@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 
 public class Quote {

app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 

app/src/main/java/org/thoughtcrime/securesms/groups/GroupManager.java

@@ -6,7 +6,7 @@ import android.graphics.Bitmap;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.DistributionTypes;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.GroupUtil;

app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 
 import org.session.libsession.avatars.AvatarHelper;
 import org.session.libsession.messaging.utilities.Data;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.DownloadUtilities;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt

@@ -18,7 +18,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 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.utilities.Address
 import org.session.libsession.utilities.DistributionTypes
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.fadeIn

app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt

@@ -17,7 +17,7 @@ import kotlinx.android.synthetic.main.fragment_enter_public_key.*
 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.utilities.Address
 import org.session.libsession.utilities.DistributionTypes
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment

app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt

@@ -22,7 +22,7 @@ import nl.komponents.kovenant.ui.successUi
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.sending_receiving.groupSizeLimit
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.utilities.fadeIn

app/src/main/java/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.activities
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient

app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt

@@ -24,7 +24,7 @@ import kotlinx.coroutines.withContext
 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.utilities.Address
 import org.session.libsession.utilities.DistributionTypes
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil

app/src/main/java/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt

@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.fragment_view_my_qr_code.*
 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.utilities.Address
 import org.session.libsession.utilities.DistributionTypes
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment

app/src/main/java/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.activities
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.session.libsession.utilities.recipients.Recipient

app/src/main/java/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt

@@ -27,11 +27,11 @@ import nl.komponents.kovenant.ui.alwaysUi
 import nl.komponents.kovenant.ui.successUi
 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.Address
 import org.session.libsession.utilities.ProfilePictureUtilities
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsession.utilities.ProfileKeyUtil
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 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.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 
 import org.session.libsignal.utilities.JsonUtil

app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt

@@ -4,7 +4,7 @@ import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import org.session.libsignal.utilities.Log
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.get

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocolV2.kt

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGroupOperation
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
 
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/MultiDeviceProtocol.kt

@@ -6,7 +6,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 

app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
 import org.thoughtcrime.securesms.ApplicationContext
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.session.libsession.utilities.recipients.Recipient

app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt

@@ -11,7 +11,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2
 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
+import org.session.libsession.utilities.ProfileKeyUtil
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager

app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt

@@ -12,7 +12,7 @@ import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.session.libsession.avatars.ProfileContactPhoto
 import org.session.libsession.messaging.mentions.MentionsManager
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.TextSecurePreferences
 import org.thoughtcrime.securesms.database.DatabaseFactory

app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java

@@ -24,12 +24,12 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import org.thoughtcrime.securesms.components.ConversationItemFooter;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 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;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 
 import java.util.Locale;
 

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java

@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.concurrent.SimpleTask;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java

@@ -51,7 +51,7 @@ import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
 import org.session.libsignal.utilities.ListenableFuture;
 import org.session.libsignal.utilities.SettableFuture;
 

app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -57,7 +57,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 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;
+import org.session.libsession.utilities.Stub;
 import org.session.libsignal.utilities.ListenableFuture;
 import org.session.libsignal.utilities.ListenableFuture.Listener;
 import org.session.libsignal.utilities.SettableFuture;

app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.session.libsignal.utilities.Log;
 

app/src/main/java/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java

@@ -11,7 +11,7 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
 import network.loki.messenger.R;
-import org.session.libsession.utilities.preferences.NotificationPrivacyPreference;
+import org.session.libsession.utilities.NotificationPrivacyPreference;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.recipients.Recipient.*;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java

@@ -28,7 +28,7 @@ import androidx.core.app.RemoteInput;
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.mms.MmsException;

app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java

@@ -40,7 +40,7 @@ import androidx.core.app.NotificationCompat;
 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.utilities.Contact;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.ServiceUtil;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/notifications/FailedNotificationBuilder.java

@@ -7,7 +7,7 @@ import android.graphics.BitmapFactory;
 
 import network.loki.messenger.R;
 import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.utilities.preferences.NotificationPrivacyPreference;
+import org.session.libsession.utilities.NotificationPrivacyPreference;
 
 public class FailedNotificationBuilder extends AbstractNotificationBuilder {
 

app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java

@@ -15,7 +15,7 @@ import org.session.libsession.messaging.messages.control.ReadReceipt;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.ExpirationInfo;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;

app/src/main/java/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java

@@ -11,7 +11,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.utilities.NotificationPrivacyPreference;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java

@@ -22,7 +22,7 @@ import com.annimon.stream.Stream;
 
 import network.loki.messenger.BuildConfig;
 import network.loki.messenger.R;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.session.libsession.utilities.recipients.Recipient;

app/src/main/java/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java

@@ -8,7 +8,7 @@ import androidx.core.app.NotificationCompat;
 
 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.NotificationPrivacyPreference;
 import org.session.libsession.utilities.TextSecurePreferences;
 
 import network.loki.messenger.R;

app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java

@@ -30,7 +30,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.mms.MmsException;

app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java

@@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 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.utilities.NotificationPrivacyPreference;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java

@@ -9,7 +9,7 @@ import android.text.TextUtils;
 import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.CursorList;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SearchDatabase;

app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java

@@ -6,7 +6,7 @@ import android.content.Context;
 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.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.SSKEnvironment;

app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java

@@ -9,7 +9,7 @@ import android.widget.Toast;
 import network.loki.messenger.R;
 
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsignal.utilities.Log;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;

app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.sskenvironment
 
 import android.content.Context
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.SSKEnvironment
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.Log

app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java

@@ -10,7 +10,7 @@ import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import org.jetbrains.annotations.NotNull;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.TextSecurePreferences;

app/src/test/java/org/thoughtcrime/securesms/recipients/RecipientExporterTest.java

@@ -9,7 +9,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 
 import static android.provider.ContactsContract.Intents.Insert.EMAIL;
 import static android.provider.ContactsContract.Intents.Insert.NAME;

libsession/src/main/java/org/session/libsession/avatars/AvatarHelper.java

@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 
 import java.io.File;
 import java.io.FileInputStream;

libsession/src/main/java/org/session/libsession/avatars/ContactColors.java

@@ -2,7 +2,7 @@ package org.session.libsession.avatars;
 
 import androidx.annotation.NonNull;
 
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
 
 import java.util.ArrayList;
 import java.util.Arrays;

libsession/src/main/java/org/session/libsession/avatars/GroupRecordContactPhoto.java

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 
 import org.session.libsession.messaging.MessagingModuleConfiguration;
 import org.session.libsession.database.StorageProtocol;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.Conversions;
 import org.session.libsignal.utilities.guava.Optional;

libsession/src/main/java/org/session/libsession/avatars/ProfileContactPhoto.java

@@ -6,7 +6,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 
 import java.io.IOException;
 import java.io.InputStream;

libsession/src/main/java/org/session/libsession/avatars/SystemContactPhoto.java

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.Conversions;
 
 import java.io.FileNotFoundException;

libsession/src/main/java/org/session/libsession/database/MessageDataProvider.kt

@@ -2,7 +2,7 @@ package org.session.libsession.database
 
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.attachments.*
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsignal.messages.SignalServiceAttachmentPointer
 import org.session.libsignal.messages.SignalServiceAttachmentStream

libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -16,7 +16,7 @@ import org.session.libsession.messaging.sending_receiving.data_extraction.DataEx
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 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.utilities.Address
 import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient.RecipientSettings
 import org.session.libsignal.crypto.ecc.ECKeyPair

libsession/src/main/java/org/session/libsession/messaging/messages/Destination.kt

@@ -3,7 +3,7 @@ package org.session.libsession.messaging.messages
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.open_groups.OpenGroupV2
 import org.session.libsession.messaging.open_groups.OpenGroup
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.utilities.toHexString
 

libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt

@@ -2,7 +2,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.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey

libsession/src/main/java/org/session/libsession/messaging/messages/control/ConfigurationMessage.kt

@@ -2,10 +2,10 @@ 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.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsession.utilities.ProfileKeyUtil
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
 import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair

libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java

@@ -4,8 +4,8 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
 import org.session.libsession.utilities.GroupUtil;

libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java

@@ -7,7 +7,7 @@ import androidx.annotation.Nullable;
 
 import org.session.libsession.messaging.messages.visible.OpenGroupInvitation;
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsignal.utilities.guava.Optional;

libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java

@@ -5,7 +5,7 @@ import androidx.annotation.Nullable;
 
 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.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
 import org.session.libsession.utilities.recipients.Recipient;

libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java

@@ -8,7 +8,7 @@ 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.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
 import org.session.libsession.utilities.recipients.Recipient;

libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java

@@ -4,7 +4,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
 import org.session.libsession.utilities.recipients.Recipient;

libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt

@@ -4,7 +4,7 @@ import com.goterl.lazycode.lazysodium.BuildConfig
 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.utilities.Address
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.protos.SignalServiceProtos

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -13,7 +13,7 @@ import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
 import org.session.libsession.messaging.messages.visible.*
 import org.session.libsession.messaging.open_groups.*
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.messaging.utilities.MessageWrapper
 import org.session.libsession.snode.RawResponsePromise
 import org.session.libsession.snode.SnodeAPI

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt

@@ -9,7 +9,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender.Error
 import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.crypto.ecc.Curve

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt

@@ -13,13 +13,13 @@ import org.session.libsession.messaging.sending_receiving.data_extraction.DataEx
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 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.utilities.Address
 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
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsession.utilities.ProfileKeyUtil
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
 import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt

@@ -9,7 +9,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.open_groups.OpenGroupAPI
 import org.session.libsession.messaging.open_groups.OpenGroupMessage
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.protos.SignalServiceProtos.*
 import org.session.libsignal.utilities.Log

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt

@@ -7,7 +7,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.messaging.open_groups.OpenGroupMessageV2
 import org.session.libsession.messaging.open_groups.OpenGroupV2
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsignal.protos.SignalServiceProtos
 import org.session.libsignal.utilities.Log

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/quotes/QuoteModel.kt

@@ -1,7 +1,7 @@
 package org.session.libsession.messaging.sending_receiving.quotes
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 
 class QuoteModel(val id: Long,
     val author: Address,

libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt

@@ -1,185 +0,0 @@
-package org.session.libsession.messaging.threads
-
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.Pair
-import androidx.annotation.VisibleForTesting
-import org.session.libsession.utilities.DelimiterUtil
-import org.session.libsession.utilities.GroupUtil
-import org.session.libsignal.utilities.guava.Optional
-import org.session.libsignal.utilities.Util
-import java.util.*
-import java.util.concurrent.atomic.AtomicReference
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-
-class Address private constructor(address: String) : Parcelable, Comparable<Address?> {
-    private val address: String = address.toLowerCase()
-
-    constructor(`in`: Parcel) : this(`in`.readString()!!) {}
-
-    val isGroup: Boolean
-        get() = GroupUtil.isEncodedGroup(address)
-    val isClosedGroup: Boolean
-        get() = GroupUtil.isClosedGroup(address)
-    val isOpenGroup: Boolean
-        get() = GroupUtil.isOpenGroup(address)
-    val isContact: Boolean
-        get() = !isGroup
-
-    fun contactIdentifier(): String {
-        if (!isContact && !isOpenGroup) {
-            if (isGroup) throw AssertionError("Not e164, is group")
-            throw AssertionError("Not e164, unknown")
-        }
-        return address
-    }
-
-    fun toGroupString(): String {
-        if (!isGroup) throw AssertionError("Not group")
-        return address
-    }
-
-    override fun toString(): String {
-        return address
-    }
-
-    fun serialize(): String {
-        return address
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return if (other == null || other !is Address) false else address == other.address
-    }
-
-    override fun hashCode(): Int {
-        return address.hashCode()
-    }
-
-    override fun describeContents(): Int {
-        return 0
-    }
-
-    override fun writeToParcel(dest: Parcel, flags: Int) {
-        dest.writeString(address)
-    }
-
-    override fun compareTo(other: Address?): Int {
-        return address.compareTo(other?.address!!)
-    }
-
-    @VisibleForTesting
-    class ExternalAddressFormatter internal constructor(localCountryCode: String, countryCode: Boolean) {
-        private val localNumber: Optional<PhoneNumber>
-        private val localCountryCode: String
-        private val ALPHA_PATTERN = Pattern.compile("[a-zA-Z]")
-        fun format(number: String?): String {
-            return number ?: "Unknown"
-        }
-
-        private fun parseAreaCode(e164Number: String, countryCode: Int): String? {
-            when (countryCode) {
-                1 -> return e164Number.substring(2, 5)
-                55 -> return e164Number.substring(3, 5)
-            }
-            return null
-        }
-
-        private fun applyAreaCodeRules(localNumber: Optional<PhoneNumber>, testNumber: String): String {
-            if (!localNumber.isPresent || !localNumber.get().areaCode.isPresent) {
-                return testNumber
-            }
-            val matcher: Matcher
-            when (localNumber.get().countryCode) {
-                1 -> {
-                    matcher = US_NO_AREACODE.matcher(testNumber)
-                    if (matcher.matches()) {
-                        return localNumber.get().areaCode.toString() + matcher.group()
-                    }
-                }
-                55 -> {
-                    matcher = BR_NO_AREACODE.matcher(testNumber)
-                    if (matcher.matches()) {
-                        return localNumber.get().areaCode.toString() + matcher.group()
-                    }
-                }
-            }
-            return testNumber
-        }
-
-        private class PhoneNumber internal constructor(val e164Number: String, val countryCode: Int, areaCode: String?) {
-            val areaCode: Optional<String?>
-
-            init {
-                this.areaCode = Optional.fromNullable(areaCode)
-            }
-        }
-
-        companion object {
-            private val TAG = ExternalAddressFormatter::class.java.simpleName
-            private val SHORT_COUNTRIES: HashSet<String?> = object : HashSet<String?>() {
-                init {
-                    add("NU")
-                    add("TK")
-                    add("NC")
-                    add("AC")
-                }
-            }
-            private val US_NO_AREACODE = Pattern.compile("^(\\d{7})$")
-            private val BR_NO_AREACODE = Pattern.compile("^(9?\\d{8})$")
-        }
-
-        init {
-            localNumber = Optional.absent()
-            this.localCountryCode = localCountryCode
-        }
-    }
-
-    companion object {
-        @JvmField val CREATOR: Parcelable.Creator<Address?> = object : Parcelable.Creator<Address?> {
-            override fun createFromParcel(`in`: Parcel): Address {
-                return Address(`in`)
-            }
-
-            override fun newArray(size: Int): Array<Address?> {
-                return arrayOfNulls(size)
-            }
-        }
-        val UNKNOWN = Address("Unknown")
-        private val TAG = Address::class.java.simpleName
-        private val cachedFormatter = AtomicReference<Pair<String, ExternalAddressFormatter>>()
-
-        @JvmStatic
-        fun fromSerialized(serialized: String): Address {
-            return Address(serialized)
-        }
-
-        @JvmStatic
-        fun fromExternal(context: Context, external: String?): Address {
-            return fromSerialized(external!!)
-        }
-
-        @JvmStatic
-        fun fromSerializedList(serialized: String, delimiter: Char): List<Address> {
-            val escapedAddresses = DelimiterUtil.split(serialized, delimiter)
-            val addresses: MutableList<Address> = LinkedList()
-            for (escapedAddress in escapedAddresses) {
-                addresses.add(fromSerialized(DelimiterUtil.unescape(escapedAddress, delimiter)))
-            }
-            return addresses
-        }
-
-        @JvmStatic
-        fun toSerializedList(addresses: List<Address>, delimiter: Char): String {
-            Collections.sort(addresses)
-            val escapedAddresses: MutableList<String> = LinkedList()
-            for (address in addresses) {
-                escapedAddresses.add(DelimiterUtil.escape(address.serialize(), delimiter))
-            }
-            return Util.join(escapedAddresses, delimiter.toString() + "")
-        }
-    }
-
-}

libsession/src/main/java/org/session/libsession/utilities/CenterAlignedRelativeSizeSpan.java

@@ -1,4 +1,4 @@
-package org.session.libsession.utilities.color.spans;
+package org.session.libsession.utilities;
 
 import androidx.annotation.NonNull;
 import android.text.TextPaint;

libsession/src/main/java/org/session/libsession/utilities/Contact.java

@@ -1,4 +1,4 @@
-package org.session.libsession.messaging.sending_receiving.sharecontacts;
+package org.session.libsession.utilities;
 
 import android.net.Uri;
 import android.os.Parcel;
@@ -17,7 +17,6 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId;
 import org.session.libsession.messaging.sending_receiving.attachments.UriAttachment;
 import org.session.libsignal.utilities.JsonUtil;
-import org.session.libsession.utilities.MediaTypes;
 
 import java.io.IOException;
 import java.util.Collections;

libsession/src/main/java/org/session/libsession/utilities/GroupRecord.kt

@@ -1,7 +1,7 @@
 package org.session.libsession.utilities
 
 import android.text.TextUtils
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import java.io.IOException
 import java.util.*
 

libsession/src/main/java/org/session/libsession/utilities/IdentityKeyMismatch.java

@@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsignal.utilities.Base64;
 import org.session.libsignal.crypto.IdentityKey;
 import org.session.libsignal.exceptions.InvalidKeyException;