implement interfaces

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

@@ -33,14 +33,18 @@ import com.google.firebase.iid.FirebaseInstanceId;
 
 import org.conscrypt.Conscrypt;
 import org.jetbrains.annotations.NotNull;
+import org.session.libsession.utilities.SSKEnvironment;
+import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsignal.libsignal.state.SessionRecord;
 import org.signal.aesgcmprovider.AesGcmProvider;
-import org.thoughtcrime.securesms.components.TypingStatusRepository;
+import org.thoughtcrime.securesms.sskenvironment.ProfileManager;
+import org.thoughtcrime.securesms.sskenvironment.ReadReceiptManager;
+import org.thoughtcrime.securesms.sskenvironment.TypingStatusRepository;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
@@ -71,13 +75,12 @@ import org.thoughtcrime.securesms.loki.protocol.SessionResetImplementation;
 import org.thoughtcrime.securesms.loki.utilities.Broadcaster;
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities;
 import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.notifications.OptimizedMessageNotifier;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
@@ -148,6 +151,8 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   private TypingStatusRepository  typingStatusRepository;
   private TypingStatusSender      typingStatusSender;
   private JobManager              jobManager;
+  private ReadReceiptManager      readReceiptManager;
+  private ProfileManager          profileManager;
   private IncomingMessageObserver incomingMessageObserver;
   private ObjectGraph             objectGraph;
   private PersistentLogger        persistentLogger;
@@ -220,10 +225,13 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     initializeExpiringMessageManager();
     initializeTypingStatusRepository();
     initializeTypingStatusSender();
+    initializeReadReceiptManager();
+    initializeProfileManager();
     initializePeriodicTasks();
     initializeWebRtc();
     initializePendingMessages();
     initializeBlobProvider();
+    SSKEnvironment.Companion.configure(getTypingStatusRepository(), getReadReceiptManager(), getProfileManager(), messageNotifier, getExpiringMessageManager());
   }
 
   @Override
@@ -279,6 +287,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     return typingStatusSender;
   }
 
+  public ReadReceiptManager getReadReceiptManager() { return readReceiptManager; }
+
+  public ProfileManager getProfileManager() { return profileManager; }
+
   public boolean isAppVisible() {
     return isAppVisible;
   }
@@ -365,6 +377,14 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     this.typingStatusRepository = new TypingStatusRepository();
   }
 
+  private void initializeReadReceiptManager() {
+    this.readReceiptManager = new ReadReceiptManager();
+  }
+
+  private void initializeProfileManager() {
+    this.profileManager = new ProfileManager();
+  }
+
   private void initializeTypingStatusSender() {
     this.typingStatusSender = new TypingStatusSender(this);
   }
@@ -522,7 +542,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
       String encodedProfileKey = ProfileKeyUtil.generateEncodedProfileKey(this);
       byte[] profileKey = ProfileKeyUtil.getProfileKeyFromEncodedString(encodedProfileKey);
       try {
-        File profilePicture = AvatarHelper.getAvatarFile(this, Address.fromSerialized(userPublicKey));
+        File profilePicture = AvatarHelper.getAvatarFile(this, Address.Companion.fromSerialized(userPublicKey));
         StreamDetails stream = new StreamDetails(new FileInputStream(profilePicture), "image/jpeg", profilePicture.length());
         FileServerAPI.shared.uploadProfilePicture(FileServerAPI.shared.getServer(), profileKey, stream, () -> {
           TextSecurePreferences.setLastProfilePictureUpload(this, new Date().getTime());
@@ -549,7 +569,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
       String url = TextSecurePreferences.getProfilePictureURL(this);
       String userMasterDevice = TextSecurePreferences.getMasterHexEncodedPublicKey(this);
       if (userMasterDevice != null) {
-        Recipient userMasterDeviceAsRecipient = Recipient.from(this, Address.fromSerialized(userMasterDevice), false).resolve();
+        Recipient userMasterDeviceAsRecipient = Recipient.from(this, Address.Companion.fromSerialized(userMasterDevice), false).resolve();
         profileKey = userMasterDeviceAsRecipient.getProfileKey();
         url = userMasterDeviceAsRecipient.getProfileAvatar();
       }

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

@@ -5,12 +5,12 @@ import androidx.annotation.Nullable;
 import android.view.View;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.session.libsignal.libsignal.util.guava.Optional;
 

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

@@ -52,7 +52,7 @@ import androidx.viewpager.widget.ViewPager;
 import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
 import com.google.android.material.tabs.TabLayout;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;
@@ -60,7 +60,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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;

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

@@ -55,7 +55,7 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.components.MediaView;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
 import org.thoughtcrime.securesms.logging.Log;
@@ -64,8 +64,8 @@ import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;

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

@@ -51,8 +51,8 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;

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

@@ -11,7 +11,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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Conversions;
 
 import java.security.MessageDigest;

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

@@ -37,7 +37,7 @@ import androidx.appcompat.widget.Toolbar;
 
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.logging.Log;
@@ -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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -250,7 +250,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onContactSelected(String number) {
-    Recipient recipient = Recipient.from(this, Address.fromExternal(this, number), true);
+    Recipient recipient = Recipient.from(this, Address.Companion.fromExternal(this, number), true);
     long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
     createConversation(existingThread, recipient.getAddress(), ThreadDatabase.DistributionTypes.DEFAULT);
   }

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

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

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

@@ -21,12 +21,12 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientExporter;
+import org.session.libsession.messaging.threads.recipients.RecipientExporter;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.Objects;

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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;

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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;
 import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan;
 

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

@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;

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

@@ -28,8 +28,8 @@ import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;

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

@@ -5,12 +5,12 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.jobs.TypingSendJob;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol;
 

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java

@@ -6,7 +6,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.util.Conversions;

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java

@@ -6,7 +6,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java

@@ -6,7 +6,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.util.Conversions;
 
 import java.io.FileNotFoundException;

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

@@ -1,34 +1,14 @@
 package org.thoughtcrime.securesms.contactshare;
 
-import android.content.ContentValues;
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 
-import com.annimon.stream.Stream;
+import org.session.libsession.messaging.sending_receiving.contacts.Contact;
 
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
-import org.thoughtcrime.securesms.contactshare.Contact.Email;
-import org.thoughtcrime.securesms.contactshare.Contact.Phone;
-import org.thoughtcrime.securesms.contactshare.Contact.PostalAddress;
-import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.SpanUtil;
-import org.thoughtcrime.securesms.util.Util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 
 import network.loki.messenger.R;
 

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

@@ -119,7 +119,7 @@ import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.DraftDatabase;
 import org.thoughtcrime.securesms.database.DraftDatabase.Draft;
@@ -175,9 +175,9 @@ import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.GroupShareProfileView;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
+import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;

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

@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Conversions;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.LRUCache;

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

@@ -66,7 +66,7 @@ import org.thoughtcrime.securesms.components.ConversationTypingView;
 import org.thoughtcrime.securesms.components.recyclerview.SmoothScrollingLinearLayoutManager;
 import org.thoughtcrime.securesms.conversation.ConversationAdapter.HeaderViewHolder;
 import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickListener;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
@@ -84,7 +84,7 @@ import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.UnknownSenderView;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.stickers.StickerLocator;

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

@@ -95,8 +95,8 @@ import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 import org.thoughtcrime.securesms.mms.TextSlide;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.GroupUtil;

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

@@ -18,8 +18,8 @@ import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;

app/src/main/java/org/thoughtcrime/securesms/crypto/SecurityEvent.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto;
 import android.content.Context;
 import android.content.Intent;
 
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 
 /**

app/src/main/java/org/thoughtcrime/securesms/crypto/SessionUtil.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.session.libsignal.libsignal.SignalProtocolAddress;
 import org.session.libsignal.libsignal.state.SessionStore;
 import org.session.libsignal.service.api.push.SignalServiceAddress;

app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java

@@ -10,7 +10,7 @@ import org.session.libsignal.metadata.SignalProtos;
 import org.session.libsignal.metadata.certificate.CertificateValidator;
 import org.session.libsignal.metadata.certificate.InvalidCertificateException;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.session.libsignal.libsignal.util.guava.Optional;

app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto.storage;
 import android.content.Context;
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.logging.Log;

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

@@ -37,27 +37,33 @@ import net.sqlcipher.database.SQLiteDatabase;
 
 import org.json.JSONArray;
 import org.json.JSONException;
-import org.thoughtcrime.securesms.attachments.Attachment;
+
-import org.thoughtcrime.securesms.attachments.AttachmentId;
+import org.session.libsignal.libsignal.logging.Log;
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+
-import org.thoughtcrime.securesms.attachments.DatabaseAttachmentAudioExtras;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.logging.Log;
+
+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.attachments.DatabaseAttachmentAudioExtras;
+import org.session.libsession.messaging.sending_receiving.attachments.StickerLocator;
+
+import org.session.libsession.utilities.JsonUtils;
+import org.session.libsession.utilities.Util;
+
 import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.stickers.StickerLocator;
+
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.ExternalStorageUtil;
-import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.video.EncryptedMediaDataSource;
 
 import java.io.File;

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

@@ -6,7 +6,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -16,10 +15,14 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.GroupUtil;
+
-import org.thoughtcrime.securesms.util.Util;
+import org.session.libsession.messaging.threads.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.Util;
+
 import org.session.libsignal.libsignal.util.guava.Optional;
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
 import org.session.libsignal.service.loki.database.LokiOpenGroupDatabaseProtocol;
@@ -125,13 +128,13 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
 
     Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, new String[] {GROUP_ID},
                                                                MEMBERS + " = ? AND " + MMS + " = ?",
-                                                               new String[] {Address.toSerializedList(members, ','), mms ? "1" : "0"},
+                                                               new String[] {Address.Companion.toSerializedList(members, ','), mms ? "1" : "0"},
                                                                null, null, null);
     try {
       if (cursor != null && cursor.moveToNext()) {
         return cursor.getString(cursor.getColumnIndexOrThrow(GROUP_ID));
       } else {
-        String groupId = GroupUtil.getEncodedId(allocateGroupId(), mms);
+        String groupId = GroupUtil.INSTANCE.getEncodedGroupID(allocateGroupId());
         create(groupId, null, members, null, null, admins);
         return groupId;
       }
@@ -154,7 +157,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
       if (!includeSelf && Util.isOwnNumber(context, member))
         continue;
 
-      if (member.isPhone()) {
+      if (member.isContact()) {
         recipients.add(Recipient.from(context, member, false));
       }
     }
@@ -164,12 +167,12 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
 
   public boolean isClosedGroupMember(String hexEncodedPublicKey) {
     try {
-      Address address = Address.fromSerialized(hexEncodedPublicKey);
+      Address address = Address.Companion.fromSerialized(hexEncodedPublicKey);
       Reader reader = DatabaseFactory.getGroupDatabase(context).getGroups();
 
       GroupRecord record;
       while ((record = reader.getNext()) != null) {
-        if (record.isClosedGroup() && record.members.contains(address)) {
+        if (record.isClosedGroup() && record.getMembers().contains(address)) {
           return true;
         }
       }
@@ -188,7 +191,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     ContentValues contentValues = new ContentValues();
     contentValues.put(GROUP_ID, groupId);
     contentValues.put(TITLE, title);
-    contentValues.put(MEMBERS, Address.toSerializedList(members, ','));
+    contentValues.put(MEMBERS, Address.Companion.toSerializedList(members, ','));
 
     if (avatar != null) {
       contentValues.put(AVATAR_ID, avatar.getId());
@@ -201,15 +204,15 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     contentValues.put(AVATAR_RELAY, relay);
     contentValues.put(TIMESTAMP, System.currentTimeMillis());
     contentValues.put(ACTIVE, 1);
-    contentValues.put(MMS, GroupUtil.isMmsGroup(groupId));
+    contentValues.put(MMS, GroupUtil.INSTANCE.isMmsGroup(groupId));
 
     if (admins != null) {
-      contentValues.put(ADMINS, Address.toSerializedList(admins, ','));
+      contentValues.put(ADMINS, Address.Companion.toSerializedList(admins, ','));
     }
 
     databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
 
-    Recipient.applyCached(Address.fromSerialized(groupId), recipient -> {
+    Recipient.applyCached(Address.Companion.fromSerialized(groupId), recipient -> {
       recipient.setName(title);
       recipient.setGroupAvatarId(avatar != null ? avatar.getId() : null);
       recipient.setParticipants(Stream.of(members).map(memberAddress -> Recipient.from(context, memberAddress, true)).toList());
@@ -222,7 +225,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     int result = databaseHelper.getWritableDatabase().delete(TABLE_NAME, GROUP_ID + " = ?", new String[]{groupId});
 
     if (result > 0) {
-      Recipient.removeCached(Address.fromSerialized(groupId));
+      Recipient.removeCached(Address.Companion.fromSerialized(groupId));
       notifyConversationListListeners();
       return true;
     } else {
@@ -246,7 +249,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
                                                 GROUP_ID + " = ?",
                                                 new String[] {groupId});
 
-    Recipient.applyCached(Address.fromSerialized(groupId), recipient -> {
+    Recipient.applyCached(Address.Companion.fromSerialized(groupId), recipient -> {
       recipient.setName(title);
       recipient.setGroupAvatarId(avatar != null ? avatar.getId() : null);
     });
@@ -261,7 +264,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, GROUP_ID +  " = ?",
                                                 new String[] {groupID});
 
-    Recipient recipient = Recipient.from(context, Address.fromSerialized(groupID), false);
+    Recipient recipient = Recipient.from(context, Address.Companion.fromSerialized(groupID), false);
     recipient.setName(newValue);
   }
 
@@ -284,20 +287,20 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, GROUP_ID +  " = ?",
                                                 new String[] {groupID});
 
-    Recipient.applyCached(Address.fromSerialized(groupID), recipient -> recipient.setGroupAvatarId(avatarId == 0 ? null : avatarId));
+    Recipient.applyCached(Address.Companion.fromSerialized(groupID), recipient -> recipient.setGroupAvatarId(avatarId == 0 ? null : avatarId));
   }
 
   public void updateMembers(String groupId, List<Address> members) {
     Collections.sort(members);
 
     ContentValues contents = new ContentValues();
-    contents.put(MEMBERS, Address.toSerializedList(members, ','));
+    contents.put(MEMBERS, Address.Companion.toSerializedList(members, ','));
     contents.put(ACTIVE, 1);
 
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
                                                 new String[] {groupId});
 
-    Recipient.applyCached(Address.fromSerialized(groupId), recipient -> {
+    Recipient.applyCached(Address.Companion.fromSerialized(groupId), recipient -> {
       recipient.setParticipants(Stream.of(members).map(a -> Recipient.from(context, a, false)).toList());
     });
   }
@@ -306,7 +309,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     Collections.sort(admins);
 
     ContentValues contents = new ContentValues();
-    contents.put(ADMINS, Address.toSerializedList(admins, ','));
+    contents.put(ADMINS, Address.Companion.toSerializedList(admins, ','));
     contents.put(ACTIVE, 1);
 
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?", new String[] {groupId});
@@ -317,12 +320,12 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     currentMembers.remove(source);
 
     ContentValues contents = new ContentValues();
-    contents.put(MEMBERS, Address.toSerializedList(currentMembers, ','));
+    contents.put(MEMBERS, Address.Companion.toSerializedList(currentMembers, ','));
 
     databaseHelper.getWritableDatabase().update(TABLE_NAME, contents, GROUP_ID + " = ?",
                                                 new String[] {groupId});
 
-    Recipient.applyCached(Address.fromSerialized(groupId), recipient -> {
+    Recipient.applyCached(Address.Companion.fromSerialized(groupId), recipient -> {
       List<Recipient> current = recipient.getParticipants();
       Recipient       removal = Recipient.from(context, source, false);
 
@@ -342,7 +345,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
 
       if (cursor != null && cursor.moveToFirst()) {
         String serializedMembers = cursor.getString(cursor.getColumnIndexOrThrow(MEMBERS));
-        return Address.fromSerializedList(serializedMembers, ',');
+        return Address.Companion.fromSerializedList(serializedMembers, ',');
       }
 
       return new LinkedList<>();
@@ -421,106 +424,4 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
         this.cursor.close();
     }
   }
-
-  public static class GroupRecord {
-
-    private final String        id;
-    private final String        title;
-    private final List<Address> members;
-    private final byte[]        avatar;
-    private final long          avatarId;
-    private final byte[]        avatarKey;
-    private final byte[]        avatarDigest;
-    private final String        avatarContentType;
-    private final String        relay;
-    private final boolean       active;
-    private final boolean       mms;
-    private final String        url;
-    private final List<Address> admins;
-
-    public GroupRecord(String id, String title, String members, byte[] avatar,
-                       long avatarId, byte[] avatarKey, String avatarContentType,
-                       String relay, boolean active, byte[] avatarDigest, boolean mms, String url, String admins)
-    {
-      this.id                = id;
-      this.title             = title;
-      this.avatar            = avatar;
-      this.avatarId          = avatarId;
-      this.avatarKey         = avatarKey;
-      this.avatarDigest      = avatarDigest;
-      this.avatarContentType = avatarContentType;
-      this.relay             = relay;
-      this.active            = active;
-      this.mms               = mms;
-      this.url               = url;
-
-      if (!TextUtils.isEmpty(members)) this.members = Address.fromSerializedList(members, ',');
-      else                             this.members = new LinkedList<>();
-
-      if (!TextUtils.isEmpty(admins)) this.admins = Address.fromSerializedList(admins, ',');
-      else                            this.admins = new LinkedList<>();
-    }
-
-    public byte[] getId() {
-      try {
-        return GroupUtil.getDecodedId(id);
-      } catch (IOException ioe) {
-        throw new AssertionError(ioe);
-      }
-    }
-
-    public String getEncodedId() {
-      return id;
-    }
-
-    public String getTitle() {
-      return title;
-    }
-
-    public List<Address> getMembers() {
-      return members;
-    }
-
-    public byte[] getAvatar() {
-      return avatar;
-    }
-
-    public long getAvatarId() {
-      return avatarId;
-    }
-
-    public byte[] getAvatarKey() {
-      return avatarKey;
-    }
-
-    public byte[] getAvatarDigest() {
-      return avatarDigest;
-    }
-
-    public String getAvatarContentType() {
-      return avatarContentType;
-    }
-
-    public String getRelay() {
-      return relay;
-    }
-
-    public boolean isActive() {
-      return active;
-    }
-
-    public boolean isMms() {
-      return mms;
-    }
-
-    public boolean isOpenGroup() { return Address.fromSerialized(id).isOpenGroup(); }
-
-    public boolean isRSSFeed() { return Address.fromSerialized(id).isRSSFeed(); }
-
-    public boolean isClosedGroup() { return Address.fromSerialized(id).isClosedGroup(); }
-
-    public String getUrl() { return url; }
-
-    public List<Address> getAdmins() { return admins; }
-  }
 }

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

@@ -10,6 +10,8 @@ import net.sqlcipher.database.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
+import org.session.libsession.messaging.threads.Address;
+
 import java.util.LinkedList;
 import java.util.List;
 
@@ -80,7 +82,7 @@ public class GroupReceiptDatabase extends Database {
 
     try (Cursor cursor = db.query(TABLE_NAME, null, MMS_ID + " = ?", new String[] {String.valueOf(mmsId)}, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        results.add(new GroupReceiptInfo(Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))),
+        results.add(new GroupReceiptInfo(Address.Companion.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS))),
                                          cursor.getInt(cursor.getColumnIndexOrThrow(STATUS)),
                                          cursor.getLong(cursor.getColumnIndexOrThrow(TIMESTAMP)),
                                          cursor.getInt(cursor.getColumnIndexOrThrow(UNIDENTIFIED)) == 1));

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

@@ -15,6 +15,8 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.session.libsignal.libsignal.IdentityKey;
 
+import org.session.libsession.messaging.threads.Address;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;

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

@@ -62,8 +62,8 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
+import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;

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

@@ -29,6 +29,8 @@ import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.util.Util;
 
+import org.session.libsession.messaging.threads.Address;
+
 import java.util.HashSet;
 import java.util.Set;
 

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

@@ -10,14 +10,17 @@ import androidx.annotation.Nullable;
 import com.annimon.stream.Stream;
 
 import net.sqlcipher.database.SQLiteDatabase;
-
-import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.logging.Log;
+
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.utilities.color.MaterialColor;
-import org.thoughtcrime.securesms.util.Base64;
+import org.session.libsession.messaging.threads.Address;
-import org.thoughtcrime.securesms.util.Util;
+import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient.*;
+import org.session.libsession.utilities.Base64;
+import org.session.libsession.utilities.Util;
+
 import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.libsignal.logging.Log;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -70,67 +73,13 @@ public class RecipientDatabase extends Database {
                                                                .map(columnName -> TABLE_NAME + "." + columnName)
                                                                .toList();
 
-  public enum VibrateState {
-    DEFAULT(0), ENABLED(1), DISABLED(2);
-
-    private final int id;
-
-    VibrateState(int id) {
-      this.id = id;
-    }
-
-    public int getId() {
-      return id;
-    }
-
-    public static VibrateState fromId(int id) {
-      return values()[id];
-    }
-  }
-
-  public enum RegisteredState {
-    UNKNOWN(0), REGISTERED(1), NOT_REGISTERED(2);
-
-    private final int id;
-
-    RegisteredState(int id) {
-      this.id = id;
-    }
-
-    public int getId() {
-      return id;
-    }
-
-    public static RegisteredState fromId(int id) {
-      return values()[id];
-    }
-  }
-
-  public enum UnidentifiedAccessMode {
-    UNKNOWN(0), DISABLED(1), ENABLED(2), UNRESTRICTED(3);
-
-    private final int mode;
-
-    UnidentifiedAccessMode(int mode) {
-      this.mode = mode;
-    }
-
-    public int getMode() {
-      return mode;
-    }
-
-    public static UnidentifiedAccessMode fromMode(int mode) {
-      return values()[mode];
-    }
-  }
-
   public static final String CREATE_TABLE =
       "CREATE TABLE " + TABLE_NAME +
           " (" + ID + " INTEGER PRIMARY KEY, " +
           ADDRESS + " TEXT UNIQUE, " +
           BLOCK + " INTEGER DEFAULT 0," +
           NOTIFICATION + " TEXT DEFAULT NULL, " +
-          VIBRATE + " INTEGER DEFAULT " + VibrateState.DEFAULT.getId() + ", " +
+          VIBRATE + " INTEGER DEFAULT " + Recipient.VibrateState.DEFAULT.getId() + ", " +
           MUTE_UNTIL + " INTEGER DEFAULT 0, " +
           COLOR + " TEXT DEFAULT NULL, " +
           SEEN_INVITE_REMINDER + " INTEGER DEFAULT 0, " +
@@ -146,7 +95,7 @@ public class RecipientDatabase extends Database {
           SIGNAL_PROFILE_AVATAR + " TEXT DEFAULT NULL, " +
           PROFILE_SHARING + " INTEGER DEFAULT 0, " +
           CALL_RINGTONE + " TEXT DEFAULT NULL, " +
-          CALL_VIBRATE + " INTEGER DEFAULT " + VibrateState.DEFAULT.getId() + ", " +
+          CALL_VIBRATE + " INTEGER DEFAULT " + Recipient.VibrateState.DEFAULT.getId() + ", " +
           NOTIFICATION_CHANNEL + " TEXT DEFAULT NULL, " +
           UNIDENTIFIED_ACCESS_MODE + " INTEGER DEFAULT 0, " +
           FORCE_SMS_SELECTION + " INTEGER DEFAULT 0);";
@@ -234,16 +183,15 @@ public class RecipientDatabase extends Database {
     }
 
     return Optional.of(new RecipientSettings(blocked, muteUntil,
-                                             VibrateState.fromId(messageVibrateState),
+                                             Recipient.VibrateState.fromId(messageVibrateState),
-                                             VibrateState.fromId(callVibrateState),
+                                             Recipient.VibrateState.fromId(callVibrateState),
                                              Util.uri(messageRingtone), Util.uri(callRingtone),
-                                             color,
+                                             color, defaultSubscriptionId, expireMessages,
-            defaultSubscriptionId, expireMessages,
+                                             Recipient.RegisteredState.fromId(registeredState),
-                                             RegisteredState.fromId(registeredState),
                                              profileKey, systemDisplayName, systemContactPhoto,
                                              systemPhoneLabel, systemContactUri,
                                              signalProfileName, signalProfileAvatar, profileSharing,
-                                             notificationChannel, UnidentifiedAccessMode.fromMode(unidentifiedAccessMode),
+                                             notificationChannel, Recipient.UnidentifiedAccessMode.fromMode(unidentifiedAccessMode),
                                              forceSmsSelection));
   }
 
@@ -382,7 +330,7 @@ public class RecipientDatabase extends Database {
 
     try (Cursor cursor = db.query(TABLE_NAME, new String[] {ADDRESS}, null, null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        results.add(Address.fromExternal(context, cursor.getString(0)));
+        results.add(Address.Companion.fromExternal(context, cursor.getString(0)));
       }
     }
 
@@ -422,7 +370,7 @@ public class RecipientDatabase extends Database {
 
     try (Cursor cursor = db.query(TABLE_NAME, new String[] {ADDRESS}, REGISTERED + " = ?", new String[] {"1"}, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        results.add(Address.fromSerialized(cursor.getString(0)));
+        results.add(Address.Companion.fromSerialized(cursor.getString(0)));
       }
     }
 
@@ -435,7 +383,7 @@ public class RecipientDatabase extends Database {
 
     try (Cursor cursor = db.query(TABLE_NAME, new String[] {ADDRESS}, SYSTEM_DISPLAY_NAME + " IS NOT NULL AND " + SYSTEM_DISPLAY_NAME + " != \"\"", null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        results.add(Address.fromSerialized(cursor.getString(0)));
+        results.add(Address.Companion.fromSerialized(cursor.getString(0)));
       }
     }
 
@@ -449,7 +397,7 @@ public class RecipientDatabase extends Database {
     db.beginTransaction();
     try (Cursor cursor = db.query(TABLE_NAME, new String[] {ADDRESS, COLOR, SYSTEM_DISPLAY_NAME}, SYSTEM_DISPLAY_NAME + " IS NOT NULL AND " + SYSTEM_DISPLAY_NAME + " != \"\"", null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
-        Address address = Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)));
+        Address address = Address.Companion.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)));
         MaterialColor newColor = updater.update(cursor.getString(cursor.getColumnIndexOrThrow(SYSTEM_DISPLAY_NAME)),
                                                 cursor.getString(cursor.getColumnIndexOrThrow(COLOR)));
 
@@ -537,158 +485,6 @@ public class RecipientDatabase extends Database {
     MaterialColor update(@NonNull String name, @Nullable String color);
   }
 
-  public static class RecipientSettings {
-    private final boolean                blocked;
-    private final long                   muteUntil;
-    private final VibrateState           messageVibrateState;
-    private final VibrateState           callVibrateState;
-    private final Uri                    messageRingtone;
-    private final Uri                    callRingtone;
-    private final MaterialColor          color;
-    private final int                    defaultSubscriptionId;
-    private final int                    expireMessages;
-    private final RegisteredState        registered;
-    private final byte[]                 profileKey;
-    private final String                 systemDisplayName;
-    private final String                 systemContactPhoto;
-    private final String                 systemPhoneLabel;
-    private final String                 systemContactUri;
-    private final String                 signalProfileName;
-    private final String                 signalProfileAvatar;
-    private final boolean                profileSharing;
-    private final String                 notificationChannel;
-    private final UnidentifiedAccessMode unidentifiedAccessMode;
-    private final boolean                forceSmsSelection;
-
-    RecipientSettings(boolean blocked, long muteUntil,
-                      @NonNull VibrateState messageVibrateState,
-                      @NonNull VibrateState callVibrateState,
-                      @Nullable Uri messageRingtone,
-                      @Nullable Uri callRingtone,
-                      @Nullable MaterialColor color,
-                      int defaultSubscriptionId,
-                      int expireMessages,
-                      @NonNull RegisteredState registered,
-                      @Nullable byte[] profileKey,
-                      @Nullable String systemDisplayName,
-                      @Nullable String systemContactPhoto,
-                      @Nullable String systemPhoneLabel,
-                      @Nullable String systemContactUri,
-                      @Nullable String signalProfileName,
-                      @Nullable String signalProfileAvatar,
-                      boolean profileSharing,
-                      @Nullable String notificationChannel,
-                      @NonNull UnidentifiedAccessMode unidentifiedAccessMode,
-                      boolean forceSmsSelection)
-    {
-      this.blocked                = blocked;
-      this.muteUntil              = muteUntil;
-      this.messageVibrateState    = messageVibrateState;
-      this.callVibrateState       = callVibrateState;
-      this.messageRingtone        = messageRingtone;
-      this.callRingtone           = callRingtone;
-      this.color                  = color;
-      this.defaultSubscriptionId  = defaultSubscriptionId;
-      this.expireMessages         = expireMessages;
-      this.registered             = registered;
-      this.profileKey             = profileKey;
-      this.systemDisplayName      = systemDisplayName;
-      this.systemContactPhoto     = systemContactPhoto;
-      this.systemPhoneLabel       = systemPhoneLabel;
-      this.systemContactUri       = systemContactUri;
-      this.signalProfileName      = signalProfileName;
-      this.signalProfileAvatar    = signalProfileAvatar;
-      this.profileSharing         = profileSharing;
-      this.notificationChannel    = notificationChannel;
-      this.unidentifiedAccessMode = unidentifiedAccessMode;
-      this.forceSmsSelection      = forceSmsSelection;
-    }
-
-    public @Nullable MaterialColor getColor() {
-      return color;
-    }
-
-    public boolean isBlocked() {
-      return blocked;
-    }
-
-    public long getMuteUntil() {
-      return muteUntil;
-    }
-
-    public @NonNull VibrateState getMessageVibrateState() {
-      return messageVibrateState;
-    }
-
-    public @NonNull VibrateState getCallVibrateState() {
-      return callVibrateState;
-    }
-
-    public @Nullable Uri getMessageRingtone() {
-      return messageRingtone;
-    }
-
-    public @Nullable Uri getCallRingtone() {
-      return callRingtone;
-    }
-
-    public Optional<Integer> getDefaultSubscriptionId() {
-      return defaultSubscriptionId != -1 ? Optional.of(defaultSubscriptionId) : Optional.absent();
-    }
-
-    public int getExpireMessages() {
-      return expireMessages;
-    }
-
-    public RegisteredState getRegistered() {
-      return registered;
-    }
-
-    public @Nullable byte[] getProfileKey() {
-      return profileKey;
-    }
-
-    public @Nullable String getSystemDisplayName() {
-      return systemDisplayName;
-    }
-
-    public @Nullable String getSystemContactPhotoUri() {
-      return systemContactPhoto;
-    }
-
-    public @Nullable String getSystemPhoneLabel() {
-      return systemPhoneLabel;
-    }
-
-    public @Nullable String getSystemContactUri() {
-      return systemContactUri;
-    }
-
-    public @Nullable String getProfileName() {
-      return signalProfileName;
-    }
-
-    public @Nullable String getProfileAvatar() {
-      return signalProfileAvatar;
-    }
-
-    public boolean isProfileSharing() {
-      return profileSharing;
-    }
-
-    public @Nullable String getNotificationChannel() {
-      return notificationChannel;
-    }
-
-    public @NonNull UnidentifiedAccessMode getUnidentifiedAccessMode() {
-      return unidentifiedAccessMode;
-    }
-
-    public boolean isForceSmsSelection() {
-      return forceSmsSelection;
-    }
-  }
-
   public static class RecipientReader implements Closeable {
 
     private final Context context;
@@ -701,7 +497,7 @@ public class RecipientDatabase extends Database {
 
     public @NonNull Recipient getCurrent() {
       String serialized = cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS));
-      return Recipient.from(context, Address.fromSerialized(serialized), false);
+      return Recipient.from(context, Address.Companion.fromSerialized(serialized), false);
     }
 
     public @Nullable Recipient getNext() {

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

@@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
 import org.thoughtcrime.securesms.jobs.TrimThreadJob;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingGroupMessage;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;

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

@@ -26,7 +26,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteStatement;
 
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.HashSet;

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

@@ -0,0 +1,321 @@
+package org.thoughtcrime.securesms.database
+
+import android.content.Context
+import android.net.Uri
+import com.google.protobuf.ByteString
+import org.session.libsession.messaging.StorageProtocol
+import org.session.libsession.messaging.jobs.AttachmentUploadJob
+import org.session.libsession.messaging.jobs.Job
+import org.session.libsession.messaging.jobs.MessageSendJob
+import org.session.libsession.messaging.messages.Message
+import org.session.libsession.messaging.messages.visible.Attachment
+import org.session.libsession.messaging.messages.visible.VisibleMessage
+import org.session.libsession.messaging.opengroups.OpenGroup
+import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
+import org.session.libsession.messaging.sending_receiving.linkpreview.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
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsignal.libsignal.util.KeyHelper
+import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
+import org.session.libsignal.service.api.messages.SignalServiceGroup
+import org.session.libsignal.service.internal.push.SignalServiceProtos
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage
+import org.thoughtcrime.securesms.mms.PartAuthority
+import org.thoughtcrime.securesms.sms.IncomingGroupMessage
+import org.thoughtcrime.securesms.sms.IncomingTextMessage
+import org.thoughtcrime.securesms.util.GroupUtil
+
+class Storage(val context: Context): StorageProtocol {
+    override fun getUserPublicKey(): String? {
+        return TextSecurePreferences.getLocalNumber(context)
+    }
+
+    override fun getUserKeyPair(): Pair<String, ByteArray>? {
+        val userPublicKey = TextSecurePreferences.getLocalNumber(context) ?: return null
+        val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize()
+        return Pair(userPublicKey, userPrivateKey)
+    }
+
+    override fun getUserDisplayName(): String? {
+        return TextSecurePreferences.getProfileName(context)
+    }
+
+    override fun getUserProfileKey(): ByteArray? {
+        val profileKey = TextSecurePreferences.getProfileKey(context) ?: return null
+        return profileKey.toByteArray()
+    }
+
+    override fun getUserProfilePictureURL(): String? {
+        return TextSecurePreferences.getProfilePictureURL(context)
+    }
+
+    override fun getProfileKeyForRecipient(recipientPublicKey: String): ByteArray? {
+        val address = Address.fromSerialized(recipientPublicKey)
+        val recipient = Recipient.from(context, address, false)
+        return recipient.profileKey
+    }
+
+    override fun getOrGenerateRegistrationID(): Int {
+        var registrationID = TextSecurePreferences.getLocalRegistrationId(context)
+        if (registrationID == null) {
+            registrationID = KeyHelper.generateRegistrationId(false)
+            TextSecurePreferences.setLocalRegistrationId(context, registrationID)
+        }
+        return registrationID
+    }
+
+    override fun persist(job: Job) {
+        TODO("Not yet implemented")
+    }
+
+    override fun persist(attachments: List<Attachment>): List<Long> {
+        TODO("Not yet implemented")
+    }
+
+    override fun persist(message: VisibleMessage, quotes: QuoteModel?, linkPreview: List<LinkPreview?>, groupPublicKey: String?, openGroupID: String?): Long? {
+        TODO("Not yet implemented")
+    }
+
+    override fun markJobAsSucceeded(job: Job) {
+        TODO("Not yet implemented")
+    }
+
+    override fun markJobAsFailed(job: Job) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAllPendingJobs(type: String): List<Job> {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAttachmentUploadJob(attachmentID: Long): AttachmentUploadJob? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getMessageSendJob(messageSendJobID: String): MessageSendJob? {
+        TODO("Not yet implemented")
+    }
+
+    override fun resumeMessageSendJobIfNeeded(messageSendJobID: String) {
+        TODO("Not yet implemented")
+    }
+
+    override fun isJobCanceled(job: Job): Boolean {
+        TODO("Not yet implemented")
+    }
+
+    override fun getAuthToken(server: String): String? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getAuthToken(server)
+    }
+
+    override fun setAuthToken(server: String, newValue: String?) {
+        DatabaseFactory.getLokiAPIDatabase(context).setAuthToken(server, newValue)
+    }
+
+    override fun removeAuthToken(server: String) {
+        DatabaseFactory.getLokiAPIDatabase(context).setAuthToken(server, null)
+    }
+
+    override fun getOpenGroup(threadID: String): OpenGroup? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getThreadID(openGroupID: String): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getOpenGroupPublicKey(server: String): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun setOpenGroupPublicKey(server: String, newValue: String) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setOpenGroupDisplayName(publicKey: String, channel: Long, server: String, displayName: String) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getOpenGroupDisplayName(publicKey: String, channel: Long, server: String): String? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getLastMessageServerID(group: Long, server: String): Long? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getLastMessageServerID(group, server)
+    }
+
+    override fun setLastMessageServerID(group: Long, server: String, newValue: Long) {
+        DatabaseFactory.getLokiAPIDatabase(context).setLastMessageServerID(group, server, newValue)
+    }
+
+    override fun removeLastMessageServerID(group: Long, server: String) {
+        DatabaseFactory.getLokiAPIDatabase(context).removeLastMessageServerID(group, server)
+    }
+
+    override fun getLastDeletionServerID(group: Long, server: String): Long? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getLastDeletionServerID(group, server)
+    }
+
+    override fun setLastDeletionServerID(group: Long, server: String, newValue: Long) {
+        DatabaseFactory.getLokiAPIDatabase(context).setLastDeletionServerID(group, server, newValue)
+    }
+
+    override fun removeLastDeletionServerID(group: Long, server: String) {
+        DatabaseFactory.getLokiAPIDatabase(context).removeLastDeletionServerID(group, server)
+    }
+
+    override fun setUserCount(group: Long, server: String, newValue: Int) {
+        DatabaseFactory.getLokiAPIDatabase(context).setUserCount(group, server, newValue)
+    }
+
+    override fun setOpenGroupProfilePictureURL(group: Long, server: String, newValue: String) {
+        DatabaseFactory.getLokiAPIDatabase(context).setOpenGroupProfilePictureURL(group, server, newValue)
+    }
+
+    override fun getOpenGroupProfilePictureURL(group: Long, server: String): String? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getOpenGroupProfilePictureURL(group, server)
+    }
+
+    override fun updateTitle(groupID: String, newValue: String) {
+        DatabaseFactory.getGroupDatabase(context).updateTitle(groupID, newValue)
+    }
+
+    override fun updateProfilePicture(groupID: String, newValue: ByteArray) {
+        DatabaseFactory.getGroupDatabase(context).updateProfilePicture(groupID, newValue)
+    }
+
+    override fun getReceivedMessageTimestamps(): Set<Long> {
+        TODO("Not yet implemented")
+    }
+
+    override fun addReceivedMessageTimestamp(timestamp: Long) {
+        TODO("Not yet implemented")
+    }
+
+    override fun insertMessageOutbox(message: Message) {
+        TODO("Not yet implemented")
+    }
+
+    override fun insertMessageInbox(message: Message) {
+        TODO("Not yet implemented")
+    }
+
+    override fun setErrorMessage(message: Message, error: Exception) {
+        TODO("Not yet implemented")
+    }
+
+    override fun getGroup(groupID: String): GroupRecord? {
+        val group = DatabaseFactory.getGroupDatabase(context).getGroup(groupID)
+        return if (group.isPresent) { group.get() } else null
+    }
+
+    override fun createGroup(groupId: String, title: String?, members: List<Address>, avatar: SignalServiceAttachmentPointer?, relay: String?, admins: List<Address>) {
+        DatabaseFactory.getGroupDatabase(context).create(groupId, title, members, avatar, relay, admins)
+    }
+
+    override fun setActive(groupID: String, value: Boolean) {
+        DatabaseFactory.getGroupDatabase(context).setActive(groupID, value)
+    }
+
+    override fun removeMember(groupID: String, member: Address) {
+        DatabaseFactory.getGroupDatabase(context).removeMember(groupID, member)
+    }
+
+    override fun updateMembers(groupID: String, members: List<Address>) {
+        DatabaseFactory.getGroupDatabase(context).updateMembers(groupID, members)
+    }
+
+    override fun insertIncomingInfoMessage(context: Context, senderPublicKey: String, groupID: String, type0: SignalServiceProtos.GroupContext.Type, type1: SignalServiceGroup.Type, name: String, members: Collection<String>, admins: Collection<String>) {
+        val groupContextBuilder = SignalServiceProtos.GroupContext.newBuilder()
+                .setId(ByteString.copyFrom(GroupUtil.getDecodedId(groupID)))
+                .setType(type0)
+                .setName(name)
+                .addAllMembers(members)
+                .addAllAdmins(admins)
+        val group = SignalServiceGroup(type1, GroupUtil.getDecodedId(groupID), SignalServiceGroup.GroupType.SIGNAL, name, members.toList(), null, admins.toList())
+        val m = IncomingTextMessage(Address.fromSerialized(senderPublicKey), 1, System.currentTimeMillis(), "", Optional.of(group), 0, true)
+        val infoMessage = IncomingGroupMessage(m, groupContextBuilder.build(), "")
+        val smsDB = DatabaseFactory.getSmsDatabase(context)
+        smsDB.insertMessageInbox(infoMessage)
+    }
+
+    override fun insertOutgoingInfoMessage(context: Context, groupID: String, type: SignalServiceProtos.GroupContext.Type, name: String, members: Collection<String>, admins: Collection<String>, threadID: Long) {
+        val recipient = Recipient.from(context, Address.fromSerialized(groupID), false)
+        val groupContextBuilder = SignalServiceProtos.GroupContext.newBuilder()
+                .setId(ByteString.copyFrom(GroupUtil.getDecodedId(groupID)))
+                .setType(type)
+                .setName(name)
+                .addAllMembers(members)
+                .addAllAdmins(admins)
+        val infoMessage = OutgoingGroupMediaMessage(recipient, groupContextBuilder.build(), null, System.currentTimeMillis(), 0, null, listOf(), listOf())
+        val mmsDB = DatabaseFactory.getMmsDatabase(context)
+        val infoMessageID = mmsDB.insertMessageOutbox(infoMessage, threadID, false, null)
+        mmsDB.markAsSent(infoMessageID, true)
+    }
+
+    override fun setProfileSharing(address: Address, value: Boolean) {
+        val recipient = Recipient.from(context, address, false)
+        DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient, value)
+    }
+
+    override fun getOrCreateThreadIdFor(address: Address): Long {
+        val recipient = Recipient.from(context, address, false)
+        return DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(recipient)
+    }
+
+    override fun getOrCreateThreadIdFor(publicKey: String, groupPublicKey: String?, openGroupID: String?): Long? {
+        TODO("Not yet implemented")
+    }
+
+    override fun getThreadIdFor(address: Address): Long? {
+        val recipient = Recipient.from(context, address, false)
+        val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(recipient)
+        return if (threadID < 0) null else threadID
+    }
+
+    override fun getSessionRequestSentTimestamp(publicKey: String): Long? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getSessionRequestSentTimestamp(publicKey)
+    }
+
+    override fun setSessionRequestSentTimestamp(publicKey: String, newValue: Long) {
+        DatabaseFactory.getLokiAPIDatabase(context).setSessionRequestSentTimestamp(publicKey, newValue)
+    }
+
+    override fun getSessionRequestProcessedTimestamp(publicKey: String): Long? {
+        return DatabaseFactory.getLokiAPIDatabase(context).getSessionRequestProcessedTimestamp(publicKey)
+    }
+
+    override fun setSessionRequestProcessedTimestamp(publicKey: String, newValue: Long) {
+        DatabaseFactory.getLokiAPIDatabase(context).setSessionRequestProcessedTimestamp(publicKey, newValue)
+    }
+
+    override fun getDisplayName(publicKey: String): String? {
+        return DatabaseFactory.getLokiUserDatabase(context).getDisplayName(publicKey)
+    }
+
+    override fun getServerDisplayName(serverID: String, publicKey: String): String? {
+        return DatabaseFactory.getLokiUserDatabase(context).getServerDisplayName(serverID, publicKey)
+    }
+
+    override fun getProfilePictureURL(publicKey: String): String? {
+        return DatabaseFactory.getLokiUserDatabase(context).getProfilePictureURL(publicKey)
+    }
+
+    override fun getRecipientSettings(address: Address): Recipient.RecipientSettings? {
+        val recipientSettings = DatabaseFactory.getRecipientDatabase(context).getRecipientSettings(address)
+        return if (recipientSettings.isPresent) { recipientSettings.get() } else null
+    }
+
+    override fun getAttachmentDataUri(attachmentId: AttachmentId): Uri {
+        return PartAuthority.getAttachmentDataUri(attachmentId)
+    }
+
+    override fun getAttachmentThumbnailUri(attachmentId: AttachmentId): Uri {
+        return PartAuthority.getAttachmentThumbnailUri(attachmentId)
+    }
+}

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

@@ -29,11 +29,8 @@ import com.annimon.stream.Stream;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
-import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
-import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -42,10 +39,16 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+
-import org.thoughtcrime.securesms.util.DelimiterUtil;
+import org.session.libsession.messaging.sending_receiving.contacts.Contact;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.session.libsession.messaging.threads.GroupRecord;
-import org.thoughtcrime.securesms.util.Util;
+import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings;
+import org.session.libsession.utilities.Util;
+import org.session.libsession.utilities.TextSecurePreferences;
+import org.session.libsession.utilities.DelimiterUtil;
+
 import org.session.libsignal.libsignal.util.Pair;
 import org.session.libsignal.libsignal.util.guava.Optional;
 
@@ -553,7 +556,7 @@ public class ThreadDatabase extends Database {
       cursor = db.query(TABLE_NAME, null, ID + " = ?", new String[] {threadId+""}, null, null, null);
 
       if (cursor != null && cursor.moveToFirst()) {
-        Address address = Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)));
+        Address address = Address.Companion.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)));
         addressCache.put(threadId, address);
         return Recipient.from(context, address, false);
       }
@@ -732,7 +735,7 @@ public class ThreadDatabase extends Database {
     public ThreadRecord getCurrent() {
       long    threadId         = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.ID));
       int     distributionType = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.TYPE));
-      Address address          = Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.ADDRESS)));
+      Address address          = Address.Companion.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.ADDRESS)));
 
       Optional<RecipientSettings> settings;
       Optional<GroupRecord>       groupRecord;

app/src/main/java/org/thoughtcrime/securesms/database/documents/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.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.util.Base64;
 import org.session.libsignal.libsignal.IdentityKey;
 import org.session.libsignal.libsignal.InvalidKeyException;
@@ -41,7 +41,7 @@ public class IdentityKeyMismatch {
 
   @JsonIgnore
   public Address getAddress() {
-    return Address.fromSerialized(address);
+    return Address.Companion.fromSerialized(address);
   }
 
   public IdentityKey getIdentityKey() {

app/src/main/java/org/thoughtcrime/securesms/database/documents/NetworkFailure.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.documents;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 
 public class NetworkFailure {
 

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

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

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

@@ -6,7 +6,7 @@ import android.database.MatrixCursor;
 import android.database.MergeCursor;
 
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;

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

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AsyncLoader;
 
 public class PagingMediaLoader extends AsyncLoader<Pair<Cursor, Integer>> {

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

@@ -5,9 +5,9 @@ import android.content.Context;
 import android.database.Cursor;
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;
 
 public class ThreadMediaLoader extends AbstractCursorLoader {

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.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 
 /**
  * The base class for all message record models.  Encapsulates basic data

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

@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 
 import java.util.List;
 

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

@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;
 

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

@@ -4,13 +4,15 @@ package org.thoughtcrime.securesms.database.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.contactshare.Contact;
+import org.session.libsession.messaging.sending_receiving.contacts.Contact;
+import org.session.libsession.messaging.sending_receiving.linkpreview.LinkPreview;
+import org.session.libsession.messaging.threads.recipients.Recipient;
+
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
-import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+
 
 import java.util.LinkedList;
 import java.util.List;

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

@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.database.SmsDatabase.Status;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 
 import java.util.Collections;
 import java.util.LinkedList;

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

@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 
 public class Quote {

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

@@ -25,7 +25,7 @@ import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 
 import java.util.LinkedList;
 import java.util.List;

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

@@ -29,7 +29,7 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 
 import network.loki.messenger.R;

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

@@ -11,14 +11,14 @@ import com.google.protobuf.ByteString;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.GroupUtil;

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

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 import com.google.protobuf.ByteString;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingGroupMessage;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.util.Base64;

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

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.attachments.PointerAttachment;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.InjectableType;

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

@@ -13,7 +13,7 @@ import com.google.android.mms.pdu_alt.RetrieveConf;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;

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

@@ -13,10 +13,10 @@ import com.google.android.mms.pdu_alt.PduHeaders;
 import com.google.android.mms.pdu_alt.PduParser;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.Util;
 

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

@@ -21,7 +21,7 @@ import com.klinker.android.send_message.Utils;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.MmsSendResult;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.Hex;

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

@@ -36,7 +36,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.crypto.storage.SignalProtocolStoreImpl;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -80,9 +80,9 @@ import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.mms.StickerSlide;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.IncomingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
@@ -292,7 +292,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
             SessionMetaProtocol.handleProfileKeyUpdate(context, content);
           }
 
-          if (SessionMetaProtocol.shouldSendDeliveryReceipt(message, Address.fromSerialized(content.getSender()))) {
+          if (SessionMetaProtocol.shouldSendDeliveryReceipt(message, Address.Companion.fromSerialized(content.getSender()))) {
             handleNeedsDeliveryReceipt(content, message);
           }
         }
@@ -324,7 +324,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
         Log.w(TAG, "Got unrecognized message...");
       }
 
-      resetRecipientToPush(Recipient.from(context, Address.fromSerialized(content.getSender()), false));
+      resetRecipientToPush(Recipient.from(context, Address.Companion.fromSerialized(content.getSender()), false));
 
 //      if (envelope.isPreKeySignalMessage()) {
 //        ApplicationContext.getInstance(context).getJobManager().add(new RefreshPreKeysJob());
@@ -365,7 +365,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                        @NonNull Optional<Long>       smsMessageId)
   {
     SmsDatabase         smsDatabase         = DatabaseFactory.getSmsDatabase(context);
-    IncomingTextMessage incomingTextMessage = new IncomingTextMessage(Address.fromSerialized(content.getSender()),
+    IncomingTextMessage incomingTextMessage = new IncomingTextMessage(Address.Companion.fromSerialized(content.getSender()),
                                                                       content.getSenderDevice(),
                                                                       content.getTimestamp(),
                                                                       "", Optional.absent(), 0,
@@ -528,8 +528,8 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       if (message.getMessage().getProfileKey().isPresent()) {
         Recipient recipient = null;
 
-        if      (message.getDestination().isPresent())            recipient = Recipient.from(context, Address.fromSerialized(message.getDestination().get()), false);
+        if      (message.getDestination().isPresent())            recipient = Recipient.from(context, Address.Companion.fromSerialized(message.getDestination().get()), false);
-        else if (message.getMessage().getGroupInfo().isPresent()) recipient = Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
+        else if (message.getMessage().getGroupInfo().isPresent()) recipient = Recipient.from(context, Address.Companion.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
 
 
         if (recipient != null && !recipient.isSystemContact() && !recipient.isProfileSharing()) {
@@ -933,7 +933,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     }
 
     if (canRecoverAutomatically(e)) {
-      Recipient recipient = Recipient.from(context, Address.fromSerialized(sender), false);
+      Recipient recipient = Recipient.from(context, Address.Companion.fromSerialized(sender), false);
       LokiThreadDatabase threadDB = DatabaseFactory.getLokiThreadDatabase(context);
       long threadID = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(recipient);
       threadDB.addSessionRestoreDevice(threadID, sender);
@@ -1017,7 +1017,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
   {
     ApplicationContext.getInstance(context)
                       .getJobManager()
-                      .add(new SendDeliveryReceiptJob(Address.fromSerialized(content.getSender()), message.getTimestamp()));
+                      .add(new SendDeliveryReceiptJob(Address.Companion.fromSerialized(content.getSender()), message.getTimestamp()));
   }
 
   @SuppressLint("DefaultLocale")
@@ -1025,9 +1025,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
                                      @NonNull SignalServiceReceiptMessage message)
   {
     // Redirect message to master device conversation
-    Address masterAddress = Address.fromSerialized(content.getSender());
+    Address masterAddress = Address.Companion.fromSerialized(content.getSender());
 
-    if (masterAddress.isPhone()) {
+    if (masterAddress.isContact()) {
       Recipient masterRecipient = getMessageMasterDestination(content.getSender());
       masterAddress = masterRecipient.getAddress();
     }
@@ -1046,9 +1046,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
     if (TextSecurePreferences.isReadReceiptsEnabled(context)) {
 
       // Redirect message to master device conversation
-      Address masterAddress = Address.fromSerialized(content.getSender());
+      Address masterAddress = Address.Companion.fromSerialized(content.getSender());
 
-      if (masterAddress.isPhone()) {
+      if (masterAddress.isContact()) {
         Recipient masterRecipient = getMessageMasterDestination(content.getSender());
         masterAddress = masterRecipient.getAddress();
       }
@@ -1069,13 +1069,13 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       return;
     }
 
-    Recipient author = Recipient.from(context, Address.fromSerialized(content.getSender()), false);
+    Recipient author = Recipient.from(context, Address.Companion.fromSerialized(content.getSender()), false);
 
     long threadId;
 
     if (typingMessage.getGroupId().isPresent()) {
       // Typing messages should only apply to closed groups, thus we use `getEncodedId`
-      Address   groupAddress   = Address.fromSerialized(GroupUtil.getEncodedId(typingMessage.getGroupId().get(), false));
+      Address   groupAddress   = Address.Companion.fromSerialized(GroupUtil.getEncodedId(typingMessage.getGroupId().get(), false));
       Recipient groupRecipient = Recipient.from(context, groupAddress, false);
 
       threadId = DatabaseFactory.getThreadDatabase(context).getThreadIdIfExistsFor(groupRecipient);
@@ -1092,10 +1092,10 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
     if (typingMessage.isTypingStarted()) {
       Log.d(TAG, "Typing started on thread " + threadId);
-      ApplicationContext.getInstance(context).getTypingStatusRepository().onTypingStarted(context,threadId, author, content.getSenderDevice());
+      ApplicationContext.getInstance(context).getTypingStatusRepository().didReceiveTypingStartedMessage(context,threadId, author.getAddress(), content.getSenderDevice());
     } else {
       Log.d(TAG, "Typing stopped on thread " + threadId);
-      ApplicationContext.getInstance(context).getTypingStatusRepository().onTypingStopped(context, threadId, author, content.getSenderDevice(), false);
+      ApplicationContext.getInstance(context).getTypingStatusRepository().didReceiveTypingStoppedMessage(context, threadId, author.getAddress(), content.getSenderDevice(), false);
     }
   }
 
@@ -1112,7 +1112,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       return Optional.absent();
     }
 
-    Address       author  = Address.fromSerialized(quote.get().getAuthor().getNumber());
+    Address       author  = Address.Companion.fromSerialized(quote.get().getAuthor().getNumber());
     MessageRecord message = DatabaseFactory.getMmsSmsDatabase(context).getMessageFor(quote.get().getId(), author);
 
     if (message != null) {
@@ -1227,21 +1227,21 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
   private Recipient getSyncMessageDestination(SentTranscriptMessage message) {
     if (message.getMessage().isGroupMessage()) {
-      return Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
+      return Recipient.from(context, Address.Companion.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
     } else {
-      return Recipient.from(context, Address.fromSerialized(message.getDestination().get()), false);
+      return Recipient.from(context, Address.Companion.fromSerialized(message.getDestination().get()), false);
     }
   }
 
   private Recipient getSyncMessageMasterDestination(SentTranscriptMessage message) {
     if (message.getMessage().isGroupMessage()) {
-      return Recipient.from(context, Address.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
+      return Recipient.from(context, Address.Companion.fromSerialized(GroupUtil.getEncodedId(message.getMessage().getGroupInfo().get())), false);
     } else {
       String publicKey = message.getDestination().get();
       String userPublicKey = TextSecurePreferences.getLocalNumber(context);
       Set<String> allUserDevices = org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol.shared.getAllLinkedDevices(userPublicKey);
       if (allUserDevices.contains(publicKey)) {
-        return Recipient.from(context, Address.fromSerialized(userPublicKey), false);
+        return Recipient.from(context, Address.Companion.fromSerialized(userPublicKey), false);
       } else {
         try {
           // TODO: Burn this with fire when we can
@@ -1250,9 +1250,9 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
           if (masterPublicKey == null) {
             masterPublicKey = publicKey;
           }
-          return Recipient.from(context, Address.fromSerialized(masterPublicKey), false);
+          return Recipient.from(context, Address.Companion.fromSerialized(masterPublicKey), false);
         } catch (Exception e) {
-          return Recipient.from(context, Address.fromSerialized(publicKey), false);
+          return Recipient.from(context, Address.Companion.fromSerialized(publicKey), false);
         }
       }
     }
@@ -1260,20 +1260,20 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
 
   private Recipient getMessageDestination(SignalServiceContent content, SignalServiceDataMessage message) {
     if (message.getGroupInfo().isPresent()) {
-      return Recipient.from(context, Address.fromExternal(context, GroupUtil.getEncodedId(message.getGroupInfo().get().getGroupId(), false)), false);
+      return Recipient.from(context, Address.Companion.fromExternal(context, GroupUtil.getEncodedId(message.getGroupInfo().get().getGroupId(), false)), false);
     } else {
-      return Recipient.from(context, Address.fromExternal(context, content.getSender()), false);
+      return Recipient.from(context, Address.Companion.fromExternal(context, content.getSender()), false);
     }
   }
 
   private Recipient getMessageMasterDestination(String publicKey) {
     if (!PublicKeyValidation.isValid(publicKey)) {
-      return Recipient.from(context, Address.fromSerialized(publicKey), false);
+      return Recipient.from(context, Address.Companion.fromSerialized(publicKey), false);
     } else {
       String userPublicKey = TextSecurePreferences.getLocalNumber(context);
       Set<String> allUserDevices = org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol.shared.getAllLinkedDevices(userPublicKey);
       if (allUserDevices.contains(publicKey)) {
-        return Recipient.from(context, Address.fromSerialized(userPublicKey), false);
+        return Recipient.from(context, Address.Companion.fromSerialized(userPublicKey), false);
       } else {
         try {
           // TODO: Burn this with fire when we can
@@ -1282,21 +1282,21 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
           if (masterPublicKey == null) {
             masterPublicKey = publicKey;
           }
-          return Recipient.from(context, Address.fromSerialized(masterPublicKey), false);
+          return Recipient.from(context, Address.Companion.fromSerialized(masterPublicKey), false);
         } catch (Exception e) {
-          return Recipient.from(context, Address.fromSerialized(publicKey), false);
+          return Recipient.from(context, Address.Companion.fromSerialized(publicKey), false);
         }
       }
     }
   }
 
   private void notifyTypingStoppedFromIncomingMessage(@NonNull Recipient conversationRecipient, @NonNull String sender, int device) {
-    Recipient author   = Recipient.from(context, Address.fromSerialized(sender), false);
+    Recipient author   = Recipient.from(context, Address.Companion.fromSerialized(sender), false);
     long      threadId = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(conversationRecipient);
 
     if (threadId > 0) {
       Log.d(TAG, "Typing stopped on thread " + threadId + " due to an incoming message.");
-      ApplicationContext.getInstance(context).getTypingStatusRepository().onTypingStopped(context, threadId, author, device, true);
+      ApplicationContext.getInstance(context).getTypingStatusRepository().didReceiveTypingStoppedMessage(context, threadId, author.getAddress(), device, true);
     }
   }
 
@@ -1311,7 +1311,7 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
       return true;
     }
 
-    Recipient sender = Recipient.from(context, Address.fromSerialized(content.getSender()), false);
+    Recipient sender = Recipient.from(context, Address.Companion.fromSerialized(content.getSender()), false);
 
     if (content.getDeviceLink().isPresent()) {
       return false;

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

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.GroupUtil;

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

@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.jobs;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.session.libsignal.libsignal.util.guava.Optional;
 import org.session.libsignal.service.api.SignalServiceMessageSender;

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

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.MmsDatabase;
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.RetryLaterException;

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

@@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.jobs;
 import android.annotation.SuppressLint;
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
 
 public abstract class PushReceivedJob extends BaseJob {

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

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.contactshare.ContactModelMapper;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.jobmanager.Job;
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;

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

@@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.RetryLaterException;

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

@@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.jobs;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.util.GroupUtil;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsignal.service.api.SignalServiceMessageSender;
 import org.session.libsignal.service.api.crypto.UntrustedIdentityException;
 import org.session.libsignal.service.api.messages.SignalServiceDataMessage;
@@ -80,7 +80,7 @@ public class RequestGroupInfoJob extends BaseJob implements InjectableType {
                                                                .build();
 
     messageSender.sendMessage(0, new SignalServiceAddress(source),
-                              UnidentifiedAccessUtil.getAccessFor(context, Recipient.from(context, Address.fromExternal(context, source), false)),
+                              UnidentifiedAccessUtil.getAccessFor(context, Recipient.from(context, Address.Companion.fromExternal(context, source), false)),
                               message);
   }
 

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

@@ -5,7 +5,10 @@ import android.app.Application;
 import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.Util;
+
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
@@ -15,8 +18,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.Util;
 import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.session.libsignal.service.api.push.exceptions.PushNetworkException;
 
@@ -132,7 +133,7 @@ public class RetrieveProfileAvatarJob extends BaseJob implements InjectableType
     @Override
     public @NonNull RetrieveProfileAvatarJob create(@NonNull Parameters parameters, @NonNull Data data) {
       return new RetrieveProfileAvatarJob(parameters,
-                                          Recipient.from(application, Address.fromSerialized(data.getString(KEY_ADDRESS)), true),
+                                          Recipient.from(application, Address.Companion.fromSerialized(data.getString(KEY_ADDRESS)), true),
                                           data.getString(KEY_PROFILE_AVATAR));
     }
   }

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

@@ -4,13 +4,13 @@ package org.thoughtcrime.securesms.jobs;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.session.libsignal.service.api.SignalServiceMessageSender;
 import org.session.libsignal.service.api.crypto.UntrustedIdentityException;
 import org.session.libsignal.service.api.messages.SignalServiceReceiptMessage;

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

@@ -4,13 +4,13 @@ package org.thoughtcrime.securesms.jobs;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
-import org.thoughtcrime.securesms.database.Address;
+import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.session.libsignal.service.api.SignalServiceMessageSender;
 import org.session.libsignal.service.api.crypto.UntrustedIdentityException;

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

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

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

@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.service.SmsDeliveryListener;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
 import org.thoughtcrime.securesms.util.NumberUtil;

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

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.session.libsession.messaging.threads.recipients.Recipient;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.session.libsignal.libsignal.util.guava.Optional;

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

@@ -17,7 +17,7 @@ import network.loki.messenger.R
 import nl.komponents.kovenant.ui.successUi
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupManager
@@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.loki.utilities.fadeIn
 import org.thoughtcrime.securesms.loki.utilities.fadeOut
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.libsignal.util.guava.Optional
 import java.lang.ref.WeakReference

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

@@ -17,12 +17,12 @@ 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.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 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.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.loki.utilities.PublicKeyValidation
 

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

@@ -18,7 +18,7 @@ import nl.komponents.kovenant.ui.failUi
 import nl.komponents.kovenant.ui.successUi
 import org.session.libsignal.service.loki.utilities.toHexString
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.loki.utilities.fadeIn
 import org.thoughtcrime.securesms.loki.utilities.fadeOut
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.ThemeUtil
 import java.io.IOException

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

@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.loki.activities
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 class EditClosedGroupMembersAdapter(
     private val context: Context,

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

@@ -29,7 +29,7 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.ConversationActivity
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.loki.api.ResetThreadSessionJob

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

@@ -16,14 +16,14 @@ 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.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.FileProviderUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.loki.utilities.PublicKeyValidation

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

@@ -15,7 +15,7 @@ import kotlinx.android.synthetic.main.activity_recovery_phrase_restore.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.KeyPairUtilities
 import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities

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

@@ -20,7 +20,7 @@ import kotlinx.android.synthetic.main.activity_register.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.BaseActionBarActivity
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.KeyPairUtilities
 import org.thoughtcrime.securesms.loki.utilities.push

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

@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.loki.activities
 import android.content.Context
 import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 class SelectContactsAdapter(private val context: Context, private val glide: GlideRequests) : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
     val selectedMembers = mutableSetOf<String>()

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

@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog
 import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog

app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatPoller.kt

@@ -9,13 +9,13 @@ import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.functional.map
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobs.PushDecryptJob
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol
 import org.thoughtcrime.securesms.loki.utilities.successBackground
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.libsignal.util.guava.Optional
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer

app/src/main/java/org/thoughtcrime/securesms/loki/api/ResetThreadSessionJob.kt

@@ -1,12 +1,12 @@
 package org.thoughtcrime.securesms.loki.api
 
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.jobmanager.Data
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.BaseJob
 import org.thoughtcrime.securesms.logging.Log
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.sms.MessageSender
 import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage

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

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.database
 
 import android.content.ContentValues
 import android.content.Context
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper

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

@@ -3,16 +3,19 @@ package org.thoughtcrime.securesms.loki.database
 import android.content.ContentValues
 import android.content.Context
 import android.database.Cursor
-import org.thoughtcrime.securesms.database.Address
+
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.loki.utilities.*
-import org.thoughtcrime.securesms.recipients.Recipient
+
-import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.session.libsession.messaging.threads.Address
+import org.session.libsession.messaging.threads.recipients.Recipient
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsignal.service.loki.api.opengroups.PublicChat
+
 import org.session.libsignal.libsignal.loki.SessionResetStatus
 import org.session.libsignal.service.internal.util.JsonUtil
-import org.session.libsignal.service.loki.api.opengroups.PublicChat
 import org.session.libsignal.service.loki.database.LokiThreadDatabaseProtocol
 import org.session.libsignal.service.loki.utilities.PublicKeyValidation
 
@@ -119,7 +122,7 @@ class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
     }
 
     fun getSessionRestoreDevices(threadID: Long): Set<String> {
-        return TextSecurePreferences.getStringPreference(context, "session_restore_devices_$threadID", "")
+        return TextSecurePreferences.getStringPreference(context, "session_restore_devices_$threadID", "")!!
             .split(",")
             .filter { PublicKeyValidation.isValid(it) }
             .toSet()

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

@@ -4,12 +4,12 @@ import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
 import org.thoughtcrime.securesms.logging.Log
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.loki.database.LokiUserDatabaseProtocol
 

app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt

@@ -10,7 +10,7 @@ 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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 public class ConversationOptionsBottomSheet : BottomSheetDialogFragment() {
 

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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 class ContactSelectionListAdapter(private val context: Context, private val multiSelect: Boolean) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
     lateinit var glide: GlideRequests

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.thoughtcrime.securesms.logging.Log
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 class ContactSelectionListFragment : Fragment(), LoaderManager.LoaderCallbacks<List<ContactSelectionListItem>>, ContactClickListener {
     private var cursorFilter: String? = null

app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.loki.utilities.Contact
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.AsyncLoader
 
 sealed class ContactSelectionListItem {

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

@@ -6,13 +6,13 @@ import com.google.protobuf.ByteString
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.deferred
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager.ClosedGroupOperation
 import org.thoughtcrime.securesms.loki.utilities.recipient
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.sms.IncomingGroupMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.thoughtcrime.securesms.sms.MessageSender

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

@@ -3,13 +3,13 @@ package org.thoughtcrime.securesms.loki.protocol
 import com.google.protobuf.ByteString
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.jobmanager.Data
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobs.BaseJob
 import org.thoughtcrime.securesms.logging.Log
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.session.libsignal.service.api.push.SignalServiceAddress
 import org.session.libsignal.service.internal.push.SignalServiceProtos
 import org.session.libsignal.service.loki.protocol.meta.TTLUtilities

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

@@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.RecipientDatabase
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.api.messages.SignalServiceContent
 import org.session.libsignal.service.api.messages.SignalServiceDataMessage
@@ -56,7 +56,7 @@ object SessionMetaProtocol {
         val recipient = Recipient.from(context, Address.fromSerialized(content.sender), false)
         if (recipient.profileKey == null || !MessageDigest.isEqual(recipient.profileKey, message.profileKey.get())) {
             database.setProfileKey(recipient, message.profileKey.get())
-            database.setUnidentifiedAccessMode(recipient, RecipientDatabase.UnidentifiedAccessMode.UNKNOWN)
+            database.setUnidentifiedAccessMode(recipient, Recipient.UnidentifiedAccessMode.UNKNOWN)
             val url = content.senderProfilePictureURL.or("")
             ApplicationContext.getInstance(context).jobManager.add(RetrieveProfileAvatarJob(recipient, url))
             val userMasterPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(context)
@@ -71,7 +71,8 @@ object SessionMetaProtocol {
      */
     @JvmStatic
     fun canUserReplyToNotification(recipient: Recipient): Boolean {
-        return !recipient.address.isRSSFeed
+        // TODO return !recipient.address.isRSSFeed
+        return true
     }
 
     @JvmStatic

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

@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage
 import org.session.libsignal.libsignal.loki.SessionResetProtocol
 import org.session.libsignal.libsignal.loki.SessionResetStatus

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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.loki.protocol.shelved.multidevice.MultiDeviceProtocol
 

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.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 fun getOpenGroupDisplayName(recipient: Recipient, threadRecipient: Recipient, context: Context): String {
     val threadID = DatabaseFactory.getThreadDatabase(context).getOrCreateThreadIdFor(threadRecipient)

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

@@ -1,5 +1,5 @@
 package org.thoughtcrime.securesms.loki.utilities
 
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 data class ProfilePictureModifiedEvent(val recipient: Recipient)

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

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.loki.utilities
 
 import android.content.Context
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 
 fun recipient(context: Context, publicKey: String): Recipient {
     return Recipient.from(context, Address.fromSerialized(publicKey), false)

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

@@ -11,11 +11,11 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy
 import kotlinx.android.synthetic.main.view_profile_picture.view.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto
-import org.thoughtcrime.securesms.database.Address
+import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.recipients.Recipient
+import org.session.libsession.messaging.threads.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.session.libsignal.service.loki.protocol.mentions.MentionsManager