Merge branch 'dev' of https://github.com/oxen-io/session-android into client-side-nickname

app/build.gradle

@@ -1,17 +1,13 @@
 buildscript {
-    ext.kovenant_version = "3.3.0"
-
     repositories {
-        mavenLocal()
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
         classpath files('libs/gradle-witness.jar')
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
         classpath "com.google.gms:google-services:4.3.3"
     }
 }
@@ -25,11 +21,6 @@ apply plugin: 'com.google.gms.google-services'
 apply plugin: 'kotlinx-serialization'
 
 configurations.all {
-    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-    exclude group: "org.whispersystems", module: "signal-protocol-java"
-    exclude group: "org.whispersystems", module: "signal-protocol-android"
-    exclude group: "org.signal", module: "signal-metadata-java"
-    exclude group: "org.signal", module: "signal-metadata-android"
     exclude module: "commons-logging"
 }
 
@@ -54,7 +45,6 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.3.2'
     implementation "androidx.core:core-ktx:1.3.2"
     implementation "androidx.work:work-runtime-ktx:2.4.0"
-
     implementation ("com.google.firebase:firebase-messaging:18.0.0") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
@@ -112,11 +102,8 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
-    // Loki
-    // Local:
     implementation project(":libsignal")
     implementation project(":libsession")
-    // Remote:
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
     implementation "org.whispersystems:curve25519-java:$curve25519Version"
     implementation "com.goterl.lazycode:lazysodium-android:4.2.0@aar"
@@ -124,7 +111,7 @@ dependencies {
     implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2"
     implementation "nl.komponents.kovenant:kovenant:$kovenantVersion"
     implementation "nl.komponents.kovenant:kovenant-android:$kovenantVersion"
@@ -134,7 +121,6 @@ dependencies {
     implementation "com.github.tbruyelle:rxpermissions:0.10.2"
     implementation "com.github.ybq:Android-SpinKit:1.4.0"
     implementation "com.opencsv:opencsv:4.6"
-
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.assertj:assertj-core:3.11.1'
     testImplementation 'org.mockito:mockito-core:1.10.8'
@@ -158,8 +144,8 @@ dependencies {
     testImplementation 'org.robolectric:shadows-multidex:4.2'
 }
 
-def canonicalVersionCode = 162
+def canonicalVersionCode = 166
-def canonicalVersionName = "1.10.3"
+def canonicalVersionName = "1.10.6"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
@@ -169,7 +155,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
                   'universal'   : 5]
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion androidCompileSdkVersion
     buildToolsVersion '29.0.3'
     useLibrary 'org.apache.http.legacy'
 
@@ -209,25 +195,18 @@ android {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
 
-        minSdkVersion androidMinSdkVersion
+        minSdkVersion 21
-        targetSdkVersion androidCompileSdkVersion
+        targetSdkVersion 30
 
-        multiDexEnabled = true // Even though we're running API 21+, this is still needed for release builds
+        multiDexEnabled = true
 
         vectorDrawables.useSupportLibrary = true
         project.ext.set("archivesBaseName", "session")
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
-        buildConfigField "String", "SIGNAL_URL", "\"\""
-        buildConfigField "String", "SIGNAL_CDN_URL", "\"\""
-        buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"\""
-        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"\""
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "USER_AGENT", "\"OWA\""
-        buildConfigField "boolean", "DEV_BUILD", "false"
-        buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
-        buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
 
@@ -237,39 +216,9 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
-                    'proguard/proguard-dagger.pro',
-                    'proguard/proguard-jackson.pro',
-                    'proguard/proguard-jna.pro',
-                    'proguard/proguard-sqlite.pro',
-                    'proguard/proguard-appcompat-v7.pro',
-                    'proguard/proguard-square-okhttp.pro',
-                    'proguard/proguard-square-okio.pro',
-                    'proguard/proguard-spongycastle.pro',
-                    'proguard/proguard-rounded-image-view.pro',
-                    'proguard/proguard-glide.pro',
-                    'proguard/proguard-shortcutbadger.pro',
-                    'proguard/proguard-retrofit.pro',
-                    'proguard/proguard-webrtc.pro',
-                    'proguard/proguard-klinker.pro',
-                    'proguard/proguard-retrolambda.pro',
-                    'proguard/proguard-okhttp.pro',
-                    'proguard/proguard-ez-vcard.pro',
-                    'proguard/proguard.pro'
-            testProguardFiles 'proguard/proguard-automation.pro'
-
-            // Uncomment for testing this build type without signing.
-            //  signingConfig signingConfigs.debug
         }
-
         debug {
             minifyEnabled false
-
-            proguardFiles = buildTypes.release.proguardFiles + [
-                    'proguard/proguard-debug.pro'
-            ]
-            testProguardFiles = buildTypes.release.testProguardFiles
         }
     }
 
@@ -282,7 +231,7 @@ android {
         }
 
         website {
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
+            ext.websiteUpdateUrl = "https://github.com/oxen-io/session-android/releases"
             buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
             buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
         }
@@ -316,14 +265,8 @@ android {
     }
 }
 
-def getLastCommitTimestamp() {
+static def getLastCommitTimestamp() {
     new ByteArrayOutputStream().withStream { os ->
-        def result = exec {
-            executable = 'git'
-            args = ['log', '-1', '--pretty=format:%ct']
-            standardOutput = os
-        }
-
         return os.toString() + "000"
     }
 }
@@ -340,9 +283,3 @@ def autoResConfig() {
          .collect { matcher -> matcher.group(1) }
          .sort()
 }
-
-task qa {
-  group 'Verification'
-  description 'Quality Assurance. Run before pushing.'
-  dependsOn ':testPlayReleaseUnitTest', ':lintPlayRelease', ':assemblePlayDebug'
-}

app/src/main/AndroidManifest.xml

@@ -233,6 +233,10 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.thoughtcrime.securesms.loki.activities.HomeActivity" />
         </activity>
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.TextSecure.DayNight"/>
         <activity
             android:name="org.thoughtcrime.securesms.longmessage.LongMessageActivity"
             android:screenOrientation="portrait"

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

@@ -30,27 +30,27 @@ import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.multidex.MultiDexApplication;
 
 import org.conscrypt.Conscrypt;
+import org.session.libsession.avatars.AvatarHelper;
 import org.session.libsession.messaging.MessagingModuleConfiguration;
-import org.session.libsession.messaging.avatars.AvatarHelper;
 import org.session.libsession.messaging.file_server.FileServerAPI;
-import org.session.libsession.messaging.jobs.JobQueue;
 import org.session.libsession.messaging.mentions.MentionsManager;
 import org.session.libsession.messaging.open_groups.OpenGroupAPI;
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier;
 import org.session.libsession.messaging.sending_receiving.pollers.ClosedGroupPoller;
 import org.session.libsession.messaging.sending_receiving.pollers.Poller;
-import org.session.libsession.messaging.threads.Address;
 import org.session.libsession.snode.SnodeModule;
+import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.IdentityKeyUtil;
+import org.session.libsession.utilities.ProfileKeyUtil;
+import org.session.libsession.utilities.ProfilePictureUtilities;
 import org.session.libsession.utilities.SSKEnvironment;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.session.libsession.utilities.dynamiclanguage.LocaleParser;
-import org.session.libsession.utilities.preferences.ProfileKeyUtil;
+import org.session.libsignal.database.LokiAPIDatabaseProtocol;
-import org.session.libsignal.service.api.util.StreamDetails;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol;
+import org.session.libsignal.utilities.ThreadUtils;
-import org.session.libsignal.utilities.logging.Log;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -67,8 +67,7 @@ import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.api.BackgroundPollWorker;
 import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager;
-import org.thoughtcrime.securesms.loki.api.PublicChatManager;
+import org.thoughtcrime.securesms.loki.api.OpenGroupManager;
-import org.thoughtcrime.securesms.loki.api.SessionProtocolImpl;
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
@@ -91,9 +90,8 @@ import org.webrtc.PeerConnectionFactory.InitializationOptions;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
 
-import java.io.File;
+import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
+import java.io.InputStream;
-import java.security.SecureRandom;
 import java.security.Security;
 import java.util.Date;
 import java.util.HashSet;
@@ -134,7 +132,6 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     public MessageNotifier messageNotifier = null;
     public Poller poller = null;
     public ClosedGroupPoller closedGroupPoller = null;
-    public PublicChatManager publicChatManager = null;
     public Broadcaster broadcaster = null;
     public SignalCommunicationModule communicationModule;
     private Job firebaseInstanceIdJob;
@@ -173,15 +170,13 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);
         MessagingModuleConfiguration.Companion.configure(this,
                 DatabaseFactory.getStorage(this),
-                DatabaseFactory.getAttachmentProvider(this),
+                DatabaseFactory.getAttachmentProvider(this));
-                new SessionProtocolImpl(this));
         SnodeModule.Companion.configure(apiDB, broadcaster);
         if (userPublicKey != null) {
             MentionsManager.Companion.configureIfNeeded(userPublicKey, userDB);
         }
         setUpStorageAPIIfNeeded();
         resubmitProfilePictureIfNeeded();
-        publicChatManager = new PublicChatManager(this);
         updateOpenGroupProfilePicturesIfNeeded();
         if (userPublicKey != null) {
             registerForFCMIfNeeded(false);
@@ -211,8 +206,11 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
             poller.setCaughtUp(false);
         }
         startPollingIfNeeded();
+        // FIXME: Open group handling
+        /*
         publicChatManager.markAllAsNotCaughtUp();
-        publicChatManager.startPollersIfNeeded();
+         */
+        OpenGroupManager.INSTANCE.startPolling();
     }
 
     @Override
@@ -233,9 +231,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     @Override
     public void onTerminate() {
         stopKovenant(); // Loki
-        if (publicChatManager != null) {
+        OpenGroupManager.INSTANCE.stopPolling();
-            publicChatManager.stopPollers();
-        }
         super.onTerminate();
     }
 
@@ -468,34 +464,32 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
         }
     }
 
-    public void stopPolling() {
-        if (poller != null) {
-            poller.stopIfNeeded();
-        }
-        if (closedGroupPoller != null) {
-            closedGroupPoller.stopIfNeeded();
-        }
-        if (publicChatManager != null) {
-            publicChatManager.stopPollers();
-        }
-    }
-
     private void resubmitProfilePictureIfNeeded() {
+        // Files expire on the file server after a while, so we simply re-upload the user's profile picture
+        // at a certain interval to ensure it's always available.
         String userPublicKey = TextSecurePreferences.getLocalNumber(this);
         if (userPublicKey == null) return;
         long now = new Date().getTime();
         long lastProfilePictureUpload = TextSecurePreferences.getLastProfilePictureUpload(this);
         if (now - lastProfilePictureUpload <= 14 * 24 * 60 * 60 * 1000) return;
-        AsyncTask.execute(() -> {
+        ThreadUtils.queue(() -> {
-            String encodedProfileKey = ProfileKeyUtil.generateEncodedProfileKey(this);
+            // Don't generate a new profile key here; we do that when the user changes their profile picture
-            byte[] profileKey = ProfileKeyUtil.getProfileKeyFromEncodedString(encodedProfileKey);
+            String encodedProfileKey = TextSecurePreferences.getProfileKey(ApplicationContext.this);
             try {
-                File profilePicture = AvatarHelper.getAvatarFile(this, Address.fromSerialized(userPublicKey));
+                // Read the file into a byte array
-                StreamDetails stream = new StreamDetails(new FileInputStream(profilePicture), "image/jpeg", profilePicture.length());
+                InputStream inputStream = AvatarHelper.getInputStreamFor(ApplicationContext.this, Address.fromSerialized(userPublicKey));
-                FileServerAPI.shared.uploadProfilePicture(FileServerAPI.shared.getServer(), profileKey, stream, () -> {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                    TextSecurePreferences.setLastProfilePictureUpload(this, new Date().getTime());
+                int count;
-                    TextSecurePreferences.setProfileAvatarId(this, new SecureRandom().nextInt());
+                byte[] buffer = new byte[1024];
-                    ProfileKeyUtil.setEncodedProfileKey(this, encodedProfileKey);
+                while ((count = inputStream.read(buffer, 0, buffer.length)) != -1) {
+                    baos.write(buffer, 0, count);
+                }
+                baos.flush();
+                byte[] profilePicture = baos.toByteArray();
+                // Re-upload it
+                ProfilePictureUtilities.INSTANCE.upload(profilePicture, encodedProfileKey, ApplicationContext.this).success(unit -> {
+                    // Update the last profile picture upload date
+                    TextSecurePreferences.setLastProfilePictureUpload(ApplicationContext.this, new Date().getTime());
                     return Unit.INSTANCE;
                 });
             } catch (Exception exception) {

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

@@ -7,11 +7,11 @@ import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 import java.util.Locale;
 import java.util.Set;

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

@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.MediaDocumentsAdapter.ViewHolder;
 import org.thoughtcrime.securesms.components.DocumentView;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.Slide;

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

@@ -54,7 +54,7 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.session.libsession.messaging.messages.control.DataExtractionNotification;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;
@@ -62,7 +62,7 @@ import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader.Buc
 import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;

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

@@ -54,11 +54,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
+import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.components.MediaView;
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;

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

@@ -38,13 +38,14 @@ import androidx.loader.content.Loader;
 
 
 import org.session.libsession.messaging.messages.visible.LinkPreview;
+import org.session.libsession.messaging.messages.visible.OpenGroupInvitation;
 import org.session.libsession.messaging.messages.visible.Quote;
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
 import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
-import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
+import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
 import org.thoughtcrime.securesms.conversation.ConversationItem;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
@@ -54,17 +55,17 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
+import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.lang.ref.WeakReference;
 import java.sql.Date;
@@ -448,7 +449,18 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
       Recipient recipient = messageRecord.getRecipient();
       VisibleMessage message = new VisibleMessage();
       message.setId(messageRecord.getId());
-      message.setText(messageRecord.getBody());
+      if (messageRecord.isOpenGroupInvitation()) {
+        OpenGroupInvitation openGroupInvitation = new OpenGroupInvitation();
+        UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(messageRecord.getBody());
+        if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) {
+          UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind();
+          openGroupInvitation.setName(data.getGroupName());
+          openGroupInvitation.setUrl(data.getGroupUrl());
+        }
+        message.setOpenGroupInvitation(openGroupInvitation);
+      } else {
+        message.setText(messageRecord.getBody());
+      }
       message.setSentTimestamp(messageRecord.getTimestamp());
       if (recipient.isGroupRecipient()) {
         message.setGroupPublicKey(recipient.getAddress().toGroupString());

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

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.loki.views.UserView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Conversions;
 
 import java.security.MessageDigest;

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

@@ -41,7 +41,7 @@ import androidx.core.os.CancellationSignal;
 
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.session.libsession.utilities.TextSecurePreferences;
 

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

@@ -11,7 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.activities.LandingActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;

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

@@ -35,19 +35,18 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 
-import org.session.libsession.messaging.threads.DistributionTypes;
+import org.session.libsession.utilities.DistributionTypes;
 import org.thoughtcrime.securesms.components.SearchToolbar;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.utilities.logging.Log;
 import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment;
 import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListLoader.DisplayMode;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.session.libsession.utilities.ViewUtil;
 

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.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 
 import network.loki.messenger.R;

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.NonNull;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 
 import org.session.libsignal.utilities.Hex;

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

@@ -7,15 +7,15 @@ import org.greenrobot.eventbus.EventBus
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.messaging.sending_receiving.attachments.*
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsession.utilities.Util
-import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.utilities.guava.Optional
-import org.session.libsignal.service.api.messages.SignalServiceAttachment
+import org.session.libsignal.messages.SignalServiceAttachment
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
+import org.session.libsignal.messages.SignalServiceAttachmentPointer
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream
+import org.session.libsignal.messages.SignalServiceAttachmentStream
 import org.session.libsignal.utilities.Base64
-import org.session.libsignal.utilities.logging.Log
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.database.AttachmentDatabase
 import org.thoughtcrime.securesms.database.Database
 import org.thoughtcrime.securesms.database.DatabaseFactory
@@ -108,28 +108,28 @@ class DatabaseAttachmentProvider(context: Context, helper: SQLCipherOpenHelper)
         return null // TODO: Implement
     }
 
-    override fun updateAttachmentAfterUploadSucceeded(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: DotNetAPI.UploadResult) {
+    override fun handleSuccessfulAttachmentUpload(attachmentId: Long, attachmentStream: SignalServiceAttachmentStream, attachmentKey: ByteArray, uploadResult: DotNetAPI.UploadResult) {
         val database = DatabaseFactory.getAttachmentDatabase(context)
         val databaseAttachment = getDatabaseAttachment(attachmentId) ?: return
         val attachmentPointer = SignalServiceAttachmentPointer(uploadResult.id,
-                attachmentStream.contentType,
+            attachmentStream.contentType,
-                attachmentKey,
+            attachmentKey,
-                Optional.of(Util.toIntExact(attachmentStream.length)),
+            Optional.of(Util.toIntExact(attachmentStream.length)),
-                attachmentStream.preview,
+            attachmentStream.preview,
-                attachmentStream.width, attachmentStream.height,
+            attachmentStream.width, attachmentStream.height,
-                Optional.fromNullable(uploadResult.digest),
+            Optional.fromNullable(uploadResult.digest),
-                attachmentStream.fileName,
+            attachmentStream.fileName,
-                attachmentStream.voiceNote,
+            attachmentStream.voiceNote,
-                attachmentStream.caption,
+            attachmentStream.caption,
-                uploadResult.url);
+            uploadResult.url);
         val attachment = PointerAttachment.forPointer(Optional.of(attachmentPointer), databaseAttachment.fastPreflightId).get()
         database.updateAttachmentAfterUploadSucceeded(databaseAttachment.attachmentId, attachment)
     }
 
-    override fun updateAttachmentAfterUploadFailed(attachmentId: Long) {
+    override fun handleFailedAttachmentUpload(attachmentId: Long) {
         val database = DatabaseFactory.getAttachmentDatabase(context)
         val databaseAttachment = getDatabaseAttachment(attachmentId) ?: return
-        database.updateAttachmentAfterUploadFailed(databaseAttachment.attachmentId)
+        database.handleFailedAttachmentUpload(databaseAttachment.attachmentId)
     }
 
     override fun getMessageID(serverID: Long): Long? {
@@ -230,23 +230,24 @@ fun DatabaseAttachment.toAttachmentStream(context: Context): SessionServiceAttac
 
 fun DatabaseAttachment.toSignalAttachmentPointer(): SignalServiceAttachmentPointer? {
     if (TextUtils.isEmpty(location)) { return null }
-    if (TextUtils.isEmpty(key)) { return null }
+    // `key` can be empty in an open group context (no encryption means no encryption key)
-
     return try {
-        val id: Long = location!!.toLong()
+        val id = location!!.toLong()
-        val key: ByteArray = Base64.decode(key!!)
+        val key = Base64.decode(key!!)
-        SignalServiceAttachmentPointer(id,
+        SignalServiceAttachmentPointer(
-                contentType,
+            id,
-                key,
+            contentType,
-                Optional.of(Util.toIntExact(size)),
+            key,
-                Optional.absent(),
+            Optional.of(Util.toIntExact(size)),
-                width,
+            Optional.absent(),
-                height,
+            width,
-                Optional.fromNullable(digest),
+            height,
-                Optional.fromNullable(fileName),
+            Optional.fromNullable(digest),
-                isVoiceNote,
+            Optional.fromNullable(fileName),
-                Optional.fromNullable(caption),
+            isVoiceNote,
-                url)
+            Optional.fromNullable(caption),
+            url
+        )
     } catch (e: Exception) {
         null
     }

app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java

@@ -8,7 +8,7 @@ import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.os.Build;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import org.session.libsession.utilities.Util;
 

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java

@@ -8,7 +8,7 @@ import android.os.ParcelFileDescriptor;
 import androidx.annotation.NonNull;
 
 import org.session.libsession.utilities.MediaTypes;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.util.Pair;
 
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -16,8 +16,8 @@ import org.thoughtcrime.securesms.util.MediaUtil;
 
 import org.session.libsignal.utilities.ThreadUtils;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;

app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java

@@ -34,13 +34,13 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
 import org.jetbrains.annotations.NotNull;
 import org.thoughtcrime.securesms.attachments.AttachmentServer;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.session.libsession.utilities.ServiceUtil;
 
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java

@@ -16,9 +16,9 @@ import androidx.core.content.ContextCompat;
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
 
-import org.session.libsignal.utilities.externalstorage.NoExternalStorageException;
+import org.session.libsignal.utilities.NoExternalStorageException;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil;
+import org.session.libsignal.utilities.ExternalStorageUtil;
 import org.thoughtcrime.securesms.util.FileProviderUtil;
 import org.thoughtcrime.securesms.util.IntentUtils;
 

app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.util.BackupDirSelector;
 import org.thoughtcrime.securesms.util.BackupUtil;
 

app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.session.libsession.utilities.TextSecurePreferences;
 
 /**

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

@@ -6,7 +6,7 @@ import android.os.Build
 import android.preference.PreferenceManager
 import android.preference.PreferenceManager.getDefaultSharedPreferencesName
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsignal.utilities.logging.Log
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_BOOLEAN
 import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_INT
 import java.util.*

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

@@ -12,7 +12,7 @@ import net.sqlcipher.database.SQLiteDatabase
 import org.greenrobot.eventbus.EventBus
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
-import org.session.libsession.messaging.avatars.AvatarHelper
+import org.session.libsession.avatars.AvatarHelper
 import org.session.libsession.utilities.Conversions
 
 import org.thoughtcrime.securesms.backup.BackupProtos.*
@@ -20,13 +20,13 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream
 import org.thoughtcrime.securesms.database.*
-import org.session.libsignal.utilities.logging.Log
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase
 import org.thoughtcrime.securesms.util.BackupUtil
 import org.session.libsession.utilities.Util
-import org.session.libsignal.libsignal.kdf.HKDFv3
+import org.session.libsignal.crypto.kdf.HKDFv3
-import org.session.libsignal.libsignal.util.ByteUtil
+import org.session.libsignal.utilities.ByteUtil
 import java.io.*
 import java.lang.Exception
 import java.security.InvalidAlgorithmParameterException

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

@@ -11,16 +11,16 @@ import org.thoughtcrime.securesms.backup.BackupProtos.*
 import org.thoughtcrime.securesms.crypto.AttachmentSecret
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream
 import org.thoughtcrime.securesms.database.*
-import org.session.libsignal.utilities.logging.Log
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.util.BackupUtil
 
-import org.session.libsession.messaging.avatars.AvatarHelper
+import org.session.libsession.avatars.AvatarHelper
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Conversions
 import org.session.libsession.utilities.Util
-import org.session.libsignal.libsignal.kdf.HKDFv3
+import org.session.libsignal.crypto.kdf.HKDFv3
-import org.session.libsignal.libsignal.util.ByteUtil
+import org.session.libsignal.utilities.ByteUtil
 
 import java.io.*
 import java.security.InvalidAlgorithmParameterException

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

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

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

@@ -23,12 +23,12 @@ import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
-import org.session.libsession.messaging.avatars.ContactColors;
+import org.session.libsession.avatars.ContactColors;
-import org.session.libsession.messaging.avatars.ContactPhoto;
+import org.session.libsession.avatars.ContactPhoto;
-import org.session.libsession.messaging.avatars.ResourceContactPhoto;
+import org.session.libsession.avatars.ResourceContactPhoto;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientExporter;
+import org.session.libsession.utilities.recipients.RecipientExporter;
 import org.session.libsession.utilities.ThemeUtil;
 
 import java.util.Objects;

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

@@ -23,7 +23,7 @@ import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 
 import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.session.libsession.utilities.TextSecurePreferences;
 
 public class ComposeText extends EmojiEditText {

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

@@ -9,7 +9,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.ThemeUtil;
 
 

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

@@ -12,7 +12,7 @@ import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.Button;

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

@@ -22,12 +22,11 @@ import org.greenrobot.eventbus.ThreadMode;
 import network.loki.messenger.R;
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.mms.DocumentSlide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 public class DocumentView extends FrameLayout {
 

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

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

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

@@ -8,7 +8,7 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
 
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
 
 public class GlideBitmapListeningTarget extends BitmapImageViewTarget {
 

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

@@ -7,7 +7,7 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.DrawableImageViewTarget;
 
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
 
 public class GlideDrawableListeningTarget extends DrawableImageViewTarget {
 

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

@@ -25,21 +25,21 @@ import android.widget.Toast;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
-import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.util.concurrent.TimeUnit;
 

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

@@ -24,7 +24,7 @@ import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
 import androidx.appcompat.widget.LinearLayoutCompat;
 import android.util.AttributeSet;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.Surface;
 import android.view.View;
 

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

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

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

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

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

@@ -8,7 +8,7 @@ import androidx.annotation.UiThread;
 import android.util.AttributeSet;
 
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -23,19 +23,19 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
+
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
-import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
 
 import java.util.Collections;
 import java.util.Locale;

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

@@ -9,7 +9,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.Util;
 
 import java.util.HashMap;

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

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.util.Pair;
 import android.view.View;
 import android.widget.FrameLayout;

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java

@@ -8,7 +8,7 @@ import android.hardware.Camera.Size;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.util.DisplayMetrics;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.Surface;
 
 import java.util.Collections;

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -32,13 +32,13 @@ import android.os.Build.VERSION;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.util.AttributeSet;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.OrientationEventListener;
 import android.view.ViewGroup;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPages.java

@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import network.loki.messenger.R;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.Arrays;
 import java.util.LinkedList;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java

@@ -22,11 +22,11 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import org.session.libsession.utilities.FutureTaskListener;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 import java.util.List;
 import java.util.concurrent.ExecutionException;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java

@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 
 public class EmojiTextView extends AppCompatTextView {

app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java

@@ -16,7 +16,7 @@ import android.widget.FrameLayout;
 
 import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
 import org.thoughtcrime.securesms.components.RepeatableImageKey;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 
 import java.util.Arrays;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java

@@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.type.CollectionType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
 import network.loki.messenger.R;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import org.session.libsignal.utilities.JsonUtil;
 

app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java

@@ -7,7 +7,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
 import androidx.annotation.NonNull;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
 import org.thoughtcrime.securesms.util.Stopwatch;

app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java

@@ -12,7 +12,7 @@ import android.net.Uri;
 import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder;
 import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 
 import java.io.InputStream;

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactAccessor.java

@@ -29,7 +29,7 @@ import java.util.List;
 
 import network.loki.messenger.R;
 
-import org.session.libsession.messaging.threads.GroupRecord;
+import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.TextSecurePreferences;
 
 /**

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java

@@ -32,8 +32,7 @@ import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 
-import org.session.libsession.messaging.threads.GroupRecord;
+import org.session.libsession.utilities.GroupRecord;
-import org.session.libsession.utilities.NumberUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -131,10 +130,6 @@ public class ContactsCursorLoader extends CursorLoader {
       cursorList.addAll(getContactsCursors());
     }
 
-    if (NumberUtil.isValidSmsOrEmail(filter)) {
-      cursorList.add(getNewNumberCursor());
-    }
-
     return cursorList;
   }
 

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

@@ -4,15 +4,15 @@ import androidx.annotation.NonNull;
 
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.service.api.messages.shared.SharedContact;
+import org.session.libsignal.messages.SharedContact;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import static org.session.libsession.messaging.sending_receiving.sharecontacts.Contact.*;
+import static org.session.libsession.utilities.Contact.*;
 
 public class ContactModelMapper {
 

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

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

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

@@ -88,6 +88,7 @@ import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate;
 import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage;
 import org.session.libsession.messaging.messages.signal.OutgoingSecureMediaMessage;
 import org.session.libsession.messaging.messages.signal.OutgoingTextMessage;
+import org.session.libsession.messaging.messages.visible.OpenGroupInvitation;
 import org.session.libsession.messaging.messages.visible.VisibleMessage;
 import org.session.libsession.messaging.open_groups.OpenGroup;
 import org.session.libsession.messaging.open_groups.OpenGroupV2;
@@ -95,13 +96,13 @@ import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.DistributionTypes;
+import org.session.libsession.utilities.DistributionTypes;
-import org.session.libsession.messaging.threads.GroupRecord;
+import org.session.libsession.utilities.GroupRecord;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
+import org.session.libsession.utilities.recipients.RecipientFormattingException;
-import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
+import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.MediaTypes;
@@ -111,15 +112,15 @@ import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.AssertedSuccessListener;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
-import org.session.libsignal.libsignal.InvalidMessageException;
+import org.session.libsignal.exceptions.InvalidMessageException;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.service.loki.Mention;
+import org.session.libsession.messaging.mentions.Mention;
-import org.session.libsignal.service.loki.utilities.HexEncodingKt;
+import org.session.libsignal.utilities.HexEncodingKt;
-import org.session.libsignal.service.loki.utilities.PublicKeyValidation;
+import org.session.libsignal.utilities.PublicKeyValidation;
-import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.ListenableFuture;
-import org.session.libsignal.utilities.concurrent.SettableFuture;
+import org.session.libsignal.utilities.SettableFuture;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.ExpirationDialog;
 import org.thoughtcrime.securesms.MediaOverviewActivity;
@@ -158,6 +159,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
+import org.thoughtcrime.securesms.loki.activities.SelectContactsActivity;
 import org.thoughtcrime.securesms.loki.api.PublicChatInfoUpdateWorker;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiUserDatabase;
@@ -250,11 +252,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private static final int PICK_GIF            = 10;
   private static final int SMS_DEFAULT         = 11;
   private static final int MEDIA_SENDER        = 12;
+  private static final int INVITE_CONTACTS     = 124;
 
   private GlideRequests glideRequests;
   protected ComposeText                 composeText;
   private   AnimatingToggle             buttonToggle;
-  private   ImageButton                  sendButton;
+  private   ImageButton                 sendButton;
   private   ImageButton                 attachButton;
   private   ProfilePictureView          profilePictureView;
   private   TextView                    titleTextView;
@@ -382,6 +385,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       PublicChatInfoUpdateWorker.scheduleInstant(this, publicChat.getServer(), publicChat.getChannel());
     } else if (openGroupV2 != null) {
       PublicChatInfoUpdateWorker.scheduleInstant(this, openGroupV2.getServer(), openGroupV2.getRoom());
+      if (openGroupV2.getRoom().equals("session") || openGroupV2.getRoom().equals("oxen")
+          || openGroupV2.getRoom().equals("lokinet") || openGroupV2.getRoom().equals("crypto")) {
+        View openGroupGuidelinesView = findViewById(R.id.open_group_guidelines_view);
+        openGroupGuidelinesView.setVisibility(View.VISIBLE);
+      }
     }
 
     View rootView = findViewById(R.id.rootView);
@@ -592,7 +600,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             });
           }
         });
-
+        break;
+      case INVITE_CONTACTS:
+        if (data.getExtras() == null || !data.hasExtra(SelectContactsActivity.Companion.getSelectedContactsKey())) return;
+          String[] selectedContacts = data.getExtras().getStringArray(SelectContactsActivity.Companion.getSelectedContactsKey());
+          sendOpenGroupInvitations(selectedContacts);
         break;
     }
   }
@@ -656,6 +668,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       } else if (isActiveGroup()) {
         inflater.inflate(R.menu.conversation_push_group_options, menu);
       }
+    } else if (isOpenGroupOrRSSFeed) {
+      inflater.inflate(R.menu.conversation_invite_open_group, menu);
     }
 
     inflater.inflate(R.menu.conversation, menu);
@@ -760,6 +774,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 //    case R.id.menu_conversation_settings:     handleConversationSettings();                      return true;
       case R.id.menu_expiring_messages_off:
       case R.id.menu_expiring_messages:         handleSelectMessageExpiration();                   return true;
+      case R.id.menu_invite_to_open_group:      handleInviteToOpenGroup();                         return true;
       case android.R.id.home:                   handleReturnToConversationList();                  return true;
     }
 
@@ -1028,6 +1043,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     startActivity(intent);
   }
 
+  private void handleInviteToOpenGroup() {
+    Intent intent = new Intent(this, SelectContactsActivity.class);
+    startActivityForResult(intent, INVITE_CONTACTS);
+  }
+
   private void handleDistributionBroadcastEnabled(MenuItem item) {
     distributionType = DistributionTypes.BROADCAST;
     item.setChecked(true);
@@ -1082,8 +1102,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     if (recipient == null || attachmentManager == null) { return; }
 
-    boolean isMediaMessage = recipient.isMmsGroupRecipient() || attachmentManager.isAttachmentPresent();
-
     /* Loki - We don't support SMS
     if (!isSecureText && !isPushGroupConversation()) sendButton.disableTransport(Type.TEXTSECURE);
     if (recipient.isPushGroupRecipient())            sendButton.disableTransport(Type.SMS);
@@ -1834,6 +1852,23 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     sendComplete(allocatedThreadId);
   }
 
+  private void sendOpenGroupInvitations(String[] contactIDs) {
+    final Context context = getApplicationContext();
+    OpenGroupV2 openGroup = DatabaseFactory.getLokiThreadDatabase(context).getOpenGroupChat(threadId);
+    for (String contactID : contactIDs) {
+      Recipient recipient = Recipient.from(context, Address.fromSerialized(contactID), true);
+      VisibleMessage message = new VisibleMessage();
+      message.setSentTimestamp(System.currentTimeMillis());
+      OpenGroupInvitation openGroupInvitationMessage = new OpenGroupInvitation();
+      openGroupInvitationMessage.setName(openGroup.getName());
+      openGroupInvitationMessage.setUrl(openGroup.getJoinURL());
+      message.setOpenGroupInvitation(openGroupInvitationMessage);
+      OutgoingTextMessage outgoingTextMessage = OutgoingTextMessage.fromOpenGroupInvitation(openGroupInvitationMessage, recipient, message.getSentTimestamp());
+      DatabaseFactory.getSmsDatabase(context).insertMessageOutbox(-1, outgoingTextMessage, message.getSentTimestamp());
+      MessageSender.send(message, recipient.getAddress());
+    }
+  }
+
   private void updateToggleButtonState() {
     if (inputPanel.isRecordingInLockedMode()) {
       buttonToggle.display(sendButton);

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

@@ -40,14 +40,14 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.LRUCache;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
 import org.session.libsession.utilities.Conversions;
@@ -87,15 +87,17 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
       Collections.synchronizedMap(new LRUCache<String, SoftReference<MessageRecord>>(MAX_CACHE_SIZE));
   private final SparseArray<String> positionToCacheRef = new SparseArray<>();
 
-  private static final int MESSAGE_TYPE_OUTGOING           = 0;
+  private static final int MESSAGE_TYPE_OUTGOING            = 0;
-  private static final int MESSAGE_TYPE_INCOMING           = 1;
+  private static final int MESSAGE_TYPE_INCOMING            = 1;
-  private static final int MESSAGE_TYPE_UPDATE             = 2;
+  private static final int MESSAGE_TYPE_UPDATE              = 2;
-  private static final int MESSAGE_TYPE_AUDIO_OUTGOING     = 3;
+  private static final int MESSAGE_TYPE_AUDIO_OUTGOING      = 3;
-  private static final int MESSAGE_TYPE_AUDIO_INCOMING     = 4;
+  private static final int MESSAGE_TYPE_AUDIO_INCOMING      = 4;
-  private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING = 5;
+  private static final int MESSAGE_TYPE_THUMBNAIL_OUTGOING  = 5;
-  private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING = 6;
+  private static final int MESSAGE_TYPE_THUMBNAIL_INCOMING  = 6;
-  private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING  = 7;
+  private static final int MESSAGE_TYPE_DOCUMENT_OUTGOING   = 7;
-  private static final int MESSAGE_TYPE_DOCUMENT_INCOMING  = 8;
+  private static final int MESSAGE_TYPE_DOCUMENT_INCOMING   = 8;
+  private static final int MESSAGE_TYPE_INVITATION_OUTGOING = 9;
+  private static final int MESSAGE_TYPE_INVITATION_INCOMING = 10;
 
   private final Set<MessageRecord> batchSelected = Collections.synchronizedSet(new HashSet<MessageRecord>());
 
@@ -281,10 +283,12 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
       case MESSAGE_TYPE_AUDIO_OUTGOING:
       case MESSAGE_TYPE_THUMBNAIL_OUTGOING:
       case MESSAGE_TYPE_DOCUMENT_OUTGOING:
+      case MESSAGE_TYPE_INVITATION_OUTGOING:
       case MESSAGE_TYPE_OUTGOING:        return R.layout.conversation_item_sent;
       case MESSAGE_TYPE_AUDIO_INCOMING:
       case MESSAGE_TYPE_THUMBNAIL_INCOMING:
       case MESSAGE_TYPE_DOCUMENT_INCOMING:
+      case MESSAGE_TYPE_INVITATION_INCOMING:
       case MESSAGE_TYPE_INCOMING:        return R.layout.conversation_item_received;
       case MESSAGE_TYPE_UPDATE:          return R.layout.conversation_item_update;
       default: throw new IllegalArgumentException("unsupported item view type given to ConversationAdapter");
@@ -295,6 +299,9 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
   public int getItemViewType(@NonNull MessageRecord messageRecord) {
     if (messageRecord.isUpdate()) {
       return MESSAGE_TYPE_UPDATE;
+    } else if (messageRecord.isOpenGroupInvitation()) {
+      if (messageRecord.isOutgoing()) return MESSAGE_TYPE_INVITATION_OUTGOING;
+      else                            return MESSAGE_TYPE_INVITATION_INCOMING;
     } else if (hasAudio(messageRecord)) {
       if (messageRecord.isOutgoing()) return MESSAGE_TYPE_AUDIO_OUTGOING;
       else                            return MESSAGE_TYPE_AUDIO_INCOMING;

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

@@ -70,15 +70,15 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2;
 import org.session.libsession.messaging.sending_receiving.MessageSender;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 import org.session.libsession.utilities.concurrent.SimpleTask;
 import org.session.libsession.utilities.task.ProgressDialogAsyncTask;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.MessageDetailsActivity;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
@@ -546,7 +546,7 @@ public class ConversationFragment extends Fragment
                 .deleteMessages(serverIDs, publicChat.getChannel(), publicChat.getServer(), isSentByUser)
                 .success(l -> {
                   for (MessageRecord messageRecord : messageRecords) {
-                    Long serverID = DatabaseFactory.getLokiMessageDatabase(getContext()).getServerID(messageRecord.id, !messageRecord.isMms());
+                    Long serverID = DatabaseFactory.getLokiMessageDatabase(getContext()).getServerID(messageRecord.id,  !messageRecord.isMms());
                     if (l.contains(serverID)) {
                       if (messageRecord.isMms()) {
                         DatabaseFactory.getMmsDatabase(getActivity()).delete(messageRecord.getId());
@@ -569,7 +569,7 @@ public class ConversationFragment extends Fragment
                           .deleteMessage(serverId, openGroupChat.getRoom(), openGroupChat.getServer())
                           .success(l -> {
                             for (MessageRecord messageRecord : messageRecords) {
-                              Long serverID = DatabaseFactory.getLokiMessageDatabase(getContext()).getServerID(messageRecord.id, !messageRecord.isMms());
+                              Long serverID = DatabaseFactory.getLokiMessageDatabase(getContext()).getServerID(messageRecord.id,  !messageRecord.isMms());
                               if (serverID != null && serverID.equals(serverId)) {
                                 MessagingModuleConfiguration.shared.getMessageDataProvider().deleteMessage(messageRecord.id, !messageRecord.isMms());
                                 break;

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

@@ -61,16 +61,17 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2;
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress;
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
+import org.session.libsession.utilities.recipients.RecipientModifiedListener;
+import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.session.libsession.utilities.GroupUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.ThemeUtil;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
-import org.session.libsession.utilities.views.Stub;
+import org.session.libsession.utilities.Stub;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.MediaPreviewActivity;
 import org.thoughtcrime.securesms.MessageDetailsActivity;
@@ -92,6 +93,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities;
 import org.thoughtcrime.securesms.loki.views.MessageAudioView;
+import org.thoughtcrime.securesms.loki.views.OpenGroupInvitationView;
 import org.thoughtcrime.securesms.loki.views.ProfilePictureView;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.ImageSlide;
@@ -156,6 +158,7 @@ public class ConversationItem extends LinearLayout
   private           Stub<DocumentView>              documentViewStub;
   private           Stub<LinkPreviewView>           linkPreviewStub;
   private           Stub<StickerView>               stickerStub;
+  private           Stub<OpenGroupInvitationView>   openGroupInvitationViewStub;
   private @Nullable EventListener                   eventListener;
 
   private int defaultBubbleColor;
@@ -203,6 +206,7 @@ public class ConversationItem extends LinearLayout
     this.documentViewStub        = new Stub<>(findViewById(R.id.document_view_stub));
     this.linkPreviewStub         = new Stub<>(findViewById(R.id.link_preview_stub));
     this.stickerStub             = new Stub<>(findViewById(R.id.sticker_view_stub));
+    this.openGroupInvitationViewStub = new Stub<>(findViewById(R.id.open_group_invitation_stub));
     this.groupSenderHolder       =            findViewById(R.id.group_sender_holder);
     this.quoteView               =            findViewById(R.id.quote_view);
     this.container               =            findViewById(R.id.container);
@@ -467,7 +471,9 @@ public class ConversationItem extends LinearLayout
         bodyText.setOverflowText(null);
       }
 
-      bodyText.setText(text);
+      if (!messageRecord.isOpenGroupInvitation())
+        bodyText.setText(text);
+
       bodyText.setVisibility(View.VISIBLE);
     }
   }
@@ -528,6 +534,7 @@ public class ConversationItem extends LinearLayout
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
+      if (openGroupInvitationViewStub.resolved())  openGroupInvitationViewStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       LinkPreview linkPreview = ((MmsMessageRecord) messageRecord).getLinkPreviews().get(0);
@@ -564,6 +571,7 @@ public class ConversationItem extends LinearLayout
       if (documentViewStub.resolved())   documentViewStub.get().setVisibility(View.GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
+      if (openGroupInvitationViewStub.resolved())  openGroupInvitationViewStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       audioViewStub.get().setAudio(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getAudioSlide(), showControls);
@@ -580,6 +588,7 @@ public class ConversationItem extends LinearLayout
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
+      if (openGroupInvitationViewStub.resolved())  openGroupInvitationViewStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       documentViewStub.get().setDocument(((MediaMmsMessageRecord) messageRecord).getSlideDeck().getDocumentSlide(), showControls);
@@ -597,6 +606,7 @@ public class ConversationItem extends LinearLayout
       if (documentViewStub.resolved())  documentViewStub.get().setVisibility(View.GONE);
       if (linkPreviewStub.resolved())   linkPreviewStub.get().setVisibility(GONE);
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
+      if (openGroupInvitationViewStub.resolved())  openGroupInvitationViewStub.get().setVisibility(View.GONE);
 
       //noinspection ConstantConditions
       List<Slide> thumbnailSlides = ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlides();
@@ -619,6 +629,29 @@ public class ConversationItem extends LinearLayout
       ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setVisibility(VISIBLE);
+    } else if (messageRecord.isOpenGroupInvitation()) {
+      openGroupInvitationViewStub.get().setVisibility(View.VISIBLE);
+      if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
+      if (audioViewStub.resolved())     audioViewStub.get().setVisibility(View.GONE);
+      if (documentViewStub.resolved())  documentViewStub.get().setVisibility(View.GONE);
+      if (linkPreviewStub.resolved())   linkPreviewStub.get().setVisibility(GONE);
+      if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
+
+      UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(messageRecord.getBody());
+      String name = null, url = null;
+      if (updateMessageData.getKind() instanceof UpdateMessageData.Kind.OpenGroupInvitation) {
+        UpdateMessageData.Kind.OpenGroupInvitation data = (UpdateMessageData.Kind.OpenGroupInvitation)updateMessageData.getKind();
+        name = data.getGroupName();
+        url = data.getGroupUrl();
+      }
+
+      openGroupInvitationViewStub.get().setOpenGroup(name, url, messageRecord.isOutgoing());
+      openGroupInvitationViewStub.get().setOnLongClickListener(passthroughClickListener);
+
+      bodyText.setVisibility(View.GONE);
+
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     } else {
       if (mediaThumbnailStub.resolved()) mediaThumbnailStub.get().setVisibility(View.GONE);
       if (audioViewStub.resolved())      audioViewStub.get().setVisibility(View.GONE);

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

@@ -12,8 +12,8 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.WindowManager;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.utilities.concurrent.ListenableFuture;
+import org.session.libsignal.utilities.ListenableFuture;
 
 import java.util.concurrent.ExecutionException;
 

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

@@ -20,10 +20,10 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.loki.utilities.GeneralUtilitiesKt;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener;
+import org.session.libsession.utilities.recipients.RecipientModifiedListener;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.session.libsession.utilities.Util;
 

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

@@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.crypto;
 
 import androidx.annotation.NonNull;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.util.LimitedInputStream;
 import org.session.libsession.utilities.Util;
 

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

@@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import org.session.libsignal.libsignal.IdentityKey;
+import org.session.libsignal.crypto.IdentityKey;
-import org.session.libsignal.libsignal.InvalidKeyException;
+import org.session.libsignal.exceptions.InvalidKeyException;
 
 public class IdentityKeyParcelable implements Parcelable {
 

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

@@ -45,8 +45,8 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
 import org.session.libsession.utilities.MediaTypes;
 import org.session.libsession.utilities.Util;
 import org.session.libsignal.utilities.JsonUtil;
-import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil;
+import org.session.libsignal.utilities.ExternalStorageUtil;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
@@ -393,7 +393,7 @@ public class AttachmentDatabase extends Database {
     database.update(TABLE_NAME, values, PART_ID_WHERE, id.toStrings());
   }
 
-  public void updateAttachmentAfterUploadFailed(@NonNull AttachmentId id) {
+  public void handleFailedAttachmentUpload(@NonNull AttachmentId id) {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     ContentValues  values   = new ContentValues();
 

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

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

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

@@ -17,15 +17,14 @@ import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.GroupRecord;
+import org.session.libsession.utilities.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.utilities.guava.Optional;
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
+import org.session.libsignal.messages.SignalServiceAttachmentPointer;
-import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol;
+import org.session.libsignal.database.LokiOpenGroupDatabaseProtocol;
 
 import java.io.Closeable;
 import java.security.SecureRandom;
@@ -123,28 +122,6 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     return new Reader(cursor);
   }
 
-  // This function always creates a mms group
-  public String getOrCreateGroupForMembers(List<Address> members, List<Address> admins) {
-    Collections.sort(members);
-    Collections.sort(admins);
-
-    Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, new String[] {GROUP_ID},
-                                                               MEMBERS + " = ? AND " + MMS + " = ?",
-                                                               new String[] {Address.toSerializedList(members, ','), "1"},
-                                                               null, null, null);
-    try {
-      if (cursor != null && cursor.moveToNext()) {
-        return cursor.getString(cursor.getColumnIndexOrThrow(GROUP_ID));
-      } else {
-        String groupId = GroupUtil.getEncodedMMSGroupID(allocateGroupId());
-        create(groupId, null, members, null, null, admins, System.currentTimeMillis());
-        return groupId;
-      }
-    } finally {
-      if (cursor != null) cursor.close();
-    }
-  }
-
   public Reader getGroups() {
     @SuppressLint("Recycle")
     Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, null, null, null, null, null, null);
@@ -210,7 +187,7 @@ public class GroupDatabase extends Database implements LokiOpenGroupDatabaseProt
     contentValues.put(AVATAR_RELAY, relay);
     contentValues.put(TIMESTAMP, formationTimestamp);
     contentValues.put(ACTIVE, 1);
-    contentValues.put(MMS, GroupUtil.isMmsGroup(groupId));
+    contentValues.put(MMS, false);
 
     if (admins != null) {
       contentValues.put(ADMINS, Address.toSerializedList(admins, ','));

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

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

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

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

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

@@ -7,14 +7,14 @@ import android.text.TextUtils;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.session.libsession.database.documents.Document;
+import org.session.libsession.utilities.Document;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.IdentityKeyMismatchList;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.libsignal.IdentityKey;
+import org.session.libsignal.crypto.IdentityKey;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsignal.utilities.JsonUtil;
 
 import java.io.IOException;

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

@@ -37,10 +37,10 @@ import org.json.JSONObject;
 import org.session.libsession.utilities.GroupUtil;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.MmsNotificationAttachment;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.IdentityKeyMismatchList;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailure;
-import org.session.libsession.database.documents.NetworkFailureList;
+import org.session.libsession.utilities.NetworkFailureList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -58,18 +58,18 @@ import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId;
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
+import org.session.libsession.utilities.recipients.RecipientFormattingException;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.Closeable;
 import java.io.IOException;

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

@@ -47,13 +47,16 @@ public interface MmsSmsColumns {
                                                             BASE_PENDING_INSECURE_SMS_FALLBACK,
                                                             OUTGOING_CALL_TYPE};
 
+
+    // TODO: Clean unused keys
+
     // Message attributes
     protected static final long MESSAGE_FORCE_SMS_BIT  = 0x40;
 
     // Key Exchange Information
     protected static final long KEY_EXCHANGE_MASK                  = 0xFF00;
     protected static final long KEY_EXCHANGE_BIT                   = 0x8000;
-    protected static final long KEY_EXCHANGE_IDENTITY_VERIFIED_BIT = 0x4000;
+    protected static final long KEY_EXCHANGE_IDENTITY_VERIFIED_BIT = 0x40000;
     protected static final long KEY_EXCHANGE_IDENTITY_DEFAULT_BIT  = 0x2000;
     protected static final long KEY_EXCHANGE_CORRUPTED_BIT         = 0x1000;
     protected static final long KEY_EXCHANGE_INVALID_VERSION_BIT   = 0x800;
@@ -72,10 +75,13 @@ public interface MmsSmsColumns {
     protected static final long EXPIRATION_TIMER_UPDATE_BIT = 0x40000;
     protected static final long GROUP_UPDATE_MESSAGE_BIT    = 0x80000;
 
-    // Data Extraction Information
+    // Data Extraction Notification
     protected static final long MEDIA_SAVED_EXTRACTION_BIT = 0x01000;
     protected static final long SCREENSHOT_EXTRACTION_BIT  = 0x02000;
 
+    // Open Group Invitation
+    protected static final long OPEN_GROUP_INVITATION_BIT  = 0x04000;
+
     // Encrypted Storage Information XXX
     public    static final long ENCRYPTION_MASK                  = 0xFF000000;
     // public    static final long ENCRYPTION_SYMMETRIC_BIT         = 0x80000000; Deprecated
@@ -210,6 +216,10 @@ public interface MmsSmsColumns {
       return (type & SCREENSHOT_EXTRACTION_BIT) != 0;
     }
 
+    public static boolean isOpenGroupInvitation(long type) {
+      return (type & OPEN_GROUP_INVITATION_BIT) != 0;
+    }
+
     public static boolean isIncomingCall(long type) {
       return type == INCOMING_CALL_TYPE;
     }

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

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

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

@@ -4,15 +4,15 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import androidx.annotation.NonNull;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.session.libsignal.utilities.Base64;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.service.api.messages.SignalServiceEnvelope;
+import org.session.libsignal.messages.SignalServiceEnvelope;
-import org.session.libsignal.service.internal.util.Util;
+import org.session.libsignal.utilities.Util;
 
 import java.io.IOException;
 

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

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -12,24 +12,19 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.Recipient.*;
+import org.session.libsession.utilities.recipients.Recipient.*;
 import org.session.libsignal.utilities.Base64;
 import org.session.libsession.utilities.Util;
 
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 public class RecipientDatabase extends Database {
 

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

@@ -28,10 +28,10 @@ import com.annimon.stream.Stream;
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteStatement;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.IdentityKeyMismatchList;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
@@ -40,12 +40,12 @@ import org.session.libsession.messaging.messages.signal.IncomingGroupMessage;
 import org.session.libsession.messaging.messages.signal.IncomingTextMessage;
 import org.session.libsession.messaging.messages.signal.OutgoingTextMessage;
 
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
 
 import java.io.IOException;
 import java.security.SecureRandom;
@@ -350,7 +350,9 @@ public class SmsDatabase extends MessagingDatabase {
       if (((IncomingGroupMessage)message).isUpdateMessage()) type |= Types.GROUP_UPDATE_MESSAGE_BIT;
     }
 
-    if (message.isPush())                type |= Types.PUSH_MESSAGE_BIT;
+    if (message.isPush()) type |= Types.PUSH_MESSAGE_BIT;
+
+    if (message.isOpenGroupInvitation()) type |= Types.OPEN_GROUP_INVITATION_BIT;
 
     Recipient recipient = Recipient.from(context, message.getSender(), true);
 
@@ -443,8 +445,9 @@ public class SmsDatabase extends MessagingDatabase {
   {
     long type = Types.BASE_SENDING_TYPE;
 
-    if (message.isSecureMessage()) type |= (Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_BIT);
+    if (message.isSecureMessage())       type |= (Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_BIT);
-    if      (forceSms)                  type |= Types.MESSAGE_FORCE_SMS_BIT;
+    if (forceSms)                        type |= Types.MESSAGE_FORCE_SMS_BIT;
+    if (message.isOpenGroupInvitation()) type |= Types.OPEN_GROUP_INVITATION_BIT;
 
     Address            address               = message.getRecipient().getAddress();
     Map<Address, Long> earlyDeliveryReceipts = earlyDeliveryReceiptCache.remove(date);

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

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import android.content.Context
 import android.net.Uri
 import okhttp3.HttpUrl
-import org.session.libsession.messaging.StorageProtocol
+import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.jobs.AttachmentUploadJob
 import org.session.libsession.messaging.jobs.Job
@@ -21,23 +21,24 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
-import org.session.libsession.messaging.threads.Address
+import org.session.libsession.utilities.Address
-import org.session.libsession.messaging.threads.Address.Companion.fromSerialized
+import org.session.libsession.utilities.Address.Companion.fromSerialized
-import org.session.libsession.messaging.threads.GroupRecord
+import org.session.libsession.utilities.GroupRecord
-import org.session.libsession.messaging.threads.recipients.Recipient
+import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageData
+import org.session.libsession.messaging.utilities.UpdateMessageData
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsession.utilities.ProfileKeyUtil
-import org.session.libsignal.libsignal.ecc.ECKeyPair
+import org.session.libsignal.crypto.ecc.ECKeyPair
-import org.session.libsignal.libsignal.util.KeyHelper
+import org.session.libsignal.utilities.KeyHelper
-import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.utilities.guava.Optional
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
+import org.session.libsignal.messages.SignalServiceAttachmentPointer
-import org.session.libsignal.service.api.messages.SignalServiceGroup
+import org.session.libsignal.messages.SignalServiceGroup
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
+import org.thoughtcrime.securesms.loki.api.OpenGroupManager
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol
 import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
@@ -160,11 +161,15 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
             mmsDatabase.endTransaction()
         } else {
             val smsDatabase = DatabaseFactory.getSmsDatabase(context)
+            val isOpenGroupInvitation = (message.openGroupInvitation != null)
+
             val insertResult = if (message.sender == getUserPublicKey()) {
-                val textMessage = OutgoingTextMessage.from(message, targetRecipient)
+                val textMessage = if (isOpenGroupInvitation) OutgoingTextMessage.fromOpenGroupInvitation(message.openGroupInvitation, targetRecipient, message.sentTimestamp)
+                else OutgoingTextMessage.from(message, targetRecipient)
                 smsDatabase.insertMessageOutbox(message.threadID ?: -1, textMessage, message.sentTimestamp!!)
             } else {
-                val textMessage = IncomingTextMessage.from(message, senderAddress, group, targetRecipient.expireMessages * 1000L)
+                val textMessage = if (isOpenGroupInvitation) IncomingTextMessage.fromOpenGroupInvitation(message.openGroupInvitation, senderAddress, message.sentTimestamp)
+                else IncomingTextMessage.from(message, senderAddress, group, targetRecipient.expireMessages * 1000L)
                 val encrypted = IncomingEncryptedMessage(textMessage, textMessage.messageBody)
                 smsDatabase.insertMessageInbox(encrypted, message.receivedTimestamp ?: 0)
             }
@@ -342,7 +347,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         DatabaseFactory.getLokiAPIDatabase(context).removeLastDeletionServerID(group, server)
     }
 
-    override fun isMessageDuplicated(timestamp: Long, sender: String): Boolean {
+    override fun isDuplicateMessage(timestamp: Long): Boolean {
         return getReceivedMessageTimestamps().contains(timestamp)
     }
 
@@ -470,7 +475,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
     override fun insertIncomingInfoMessage(context: Context, senderPublicKey: String, groupID: String, type: SignalServiceGroup.Type, name: String, members: Collection<String>, admins: Collection<String>, sentTimestamp: Long) {
         val group = SignalServiceGroup(type, GroupUtil.getDecodedGroupIDAsData(groupID), SignalServiceGroup.GroupType.SIGNAL, name, members.toList(), null, admins.toList())
         val m = IncomingTextMessage(Address.fromSerialized(senderPublicKey), 1, sentTimestamp, "", Optional.of(group), 0, true)
-        val updateData = ClosedGroupUpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON()
+        val updateData = UpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON()
         val infoMessage = IncomingGroupMessage(m, groupID, updateData, true)
         val smsDB = DatabaseFactory.getSmsDatabase(context)
         smsDB.insertMessageInbox(infoMessage)
@@ -480,7 +485,7 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
         val userPublicKey = getUserPublicKey()
         val recipient = Recipient.from(context, Address.fromSerialized(groupID), false)
 
-        val updateData = ClosedGroupUpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() ?: ""
+        val updateData = UpdateMessageData.buildGroupUpdate(type, name, members)?.toJSON() ?: ""
         val infoMessage = OutgoingGroupMediaMessage(recipient, updateData, groupID, null, sentTimestamp, 0, true, null, listOf(), listOf())
         val mmsDB = DatabaseFactory.getMmsDatabase(context)
         val mmsSmsDB = DatabaseFactory.getMmsSmsDatabase(context)
@@ -552,9 +557,9 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
             val room = httpUrl.pathSegments().firstOrNull() ?: return
             val publicKey = httpUrl.queryParameter("public_key") ?: return
 
-            OpenGroupUtilities.addGroup(context, server.toString().removeSuffix("/"), room, publicKey)
+            OpenGroupManager.add(server.toString().removeSuffix("/"), room, publicKey, context)
         } else {
-            OpenGroupUtilities.addGroup(context, serverUrl, channel)
+            // TODO: No longer supported so let's remove this code
         }
     }
 

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

@@ -30,18 +30,18 @@ import com.annimon.stream.Stream;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.session.libsession.messaging.threads.DistributionTypes;
+import org.session.libsession.utilities.DistributionTypes;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
-import org.session.libsession.messaging.threads.GroupRecord;
+import org.session.libsession.utilities.GroupRecord;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings;
+import org.session.libsession.utilities.recipients.Recipient.RecipientSettings;
 import org.session.libsession.utilities.DelimiterUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;

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.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

@@ -5,7 +5,7 @@ import android.database.Cursor;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;
-import org.session.libsignal.libsignal.util.Pair;
+import org.session.libsignal.utilities.Pair;
 
 public class ConversationLoader extends AbstractCursorLoader {
   private final long    threadId;

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

@@ -12,7 +12,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AsyncLoader;
 
 public class PagingMediaLoader extends AsyncLoader<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.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AbstractCursorLoader;
 
 public class ThreadMediaLoader extends AbstractCursorLoader {

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

@@ -22,7 +22,7 @@ import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 /**
  * The base class for all message record models.  Encapsulates basic data
@@ -145,6 +145,10 @@ public abstract class DisplayRecord {
     return isMediaSavedExtraction() || isScreenshotExtraction();
   }
 
+  public boolean isOpenGroupInvitation() {
+    return MmsSmsColumns.Types.isOpenGroupInvitation(type);
+  }
+
   public boolean isCallLog() {
     return SmsDatabase.Types.isCallLog(type);
   }

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

@@ -22,14 +22,14 @@ import androidx.annotation.Nullable;
 import android.text.SpannableString;
 
 import network.loki.messenger.R;
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase.Status;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 import java.util.List;
 

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

@@ -26,14 +26,14 @@ import android.text.style.StyleSpan;
 import network.loki.messenger.R;
 
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage;
-import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageBuilder;
+import org.session.libsession.messaging.utilities.UpdateMessageBuilder;
-import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageData;
+import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailure;
 
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 import java.util.List;
 
@@ -93,14 +93,14 @@ public abstract class MessageRecord extends DisplayRecord {
   @Override
   public SpannableString getDisplayBody(@NonNull Context context) {
     if(isGroupUpdateMessage()) {
-      ClosedGroupUpdateMessageData updateMessageData = ClosedGroupUpdateMessageData.Companion.fromJSON(getBody());
+      UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody());
-      return new SpannableString(ClosedGroupUpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
+      return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isExpirationTimerUpdate()) {
       int seconds = (int) (getExpiresIn() / 1000);
-      return new SpannableString(ClosedGroupUpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
+      return new SpannableString(UpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isDataExtraction()) {
-      if (isScreenshotExtraction()) return new SpannableString((ClosedGroupUpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize())));
+      if (isScreenshotExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize())));
-      else if (isMediaSavedExtraction()) return new SpannableString((ClosedGroupUpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
+      else if (isMediaSavedExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
     }
     // TODO below lines are left here for compatibility with older group update messages, it can be deleted later on
     else if (isGroupUpdate() && isOutgoing()) {

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

@@ -4,12 +4,12 @@ package org.thoughtcrime.securesms.database.model;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsession.messaging.sending_receiving.sharecontacts.Contact;
+import org.session.libsession.utilities.Contact;
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 

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

@@ -23,10 +23,10 @@ import android.text.SpannableString;
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase.Status;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 
 import java.util.Collections;
 import java.util.LinkedList;

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

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

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

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

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

@@ -27,7 +27,7 @@ import android.text.style.StyleSpan;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
@@ -77,6 +77,8 @@ public class ThreadRecord extends DisplayRecord {
       return emphasisAdded(context.getString(R.string.ThreadRecord_group_updated));
     } else if (isGroupQuit()) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_left_the_group));
+    } else if (isOpenGroupInvitation()) {
+      return emphasisAdded(context.getString(R.string.ThreadRecord_open_group_invitation));
     } else if (isKeyExchange()) {
       return emphasisAdded(context.getString(R.string.ConversationListItem_key_exchange_message));
     } else if (SmsDatabase.Types.isFailedDecryptType(type)) {

app/src/main/java/org/thoughtcrime/securesms/dependencies/SignalCommunicationModule.java

@@ -2,14 +2,12 @@ package org.thoughtcrime.securesms.dependencies;
 
 import android.content.Context;
 
-import org.session.libsignal.service.api.SignalServiceMessageReceiver;
 import org.thoughtcrime.securesms.jobs.AvatarDownloadJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 
 import dagger.Module;
-import dagger.Provides;
 
 @Module(complete = false, injects = {AvatarDownloadJob.class,
                                      RetrieveProfileAvatarJob.class,
@@ -20,18 +18,7 @@ public class SignalCommunicationModule {
 
   private final Context                      context;
 
-  private SignalServiceMessageReceiver messageReceiver;
-
   public SignalCommunicationModule(Context context) {
-    this.context       = context;
+    this.context = context;
-  }
-
-  @Provides
-  synchronized SignalServiceMessageReceiver provideSignalMessageReceiver() {
-    if (this.messageReceiver == null) {
-      this.messageReceiver = new SignalServiceMessageReceiver();
-    }
-
-    return this.messageReceiver;
   }
 }

app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java

@@ -6,7 +6,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import android.text.TextUtils;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;

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

@@ -20,7 +20,7 @@ import com.google.android.material.tabs.TabLayout;
 
 import org.session.libsession.utilities.MediaTypes;
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.session.libsession.utilities.ViewUtil;
 

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

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
-import org.session.libsession.utilities.color.MaterialColor;
+import org.session.libsession.utilities.MaterialColor;
 import org.session.libsession.utilities.Util;
 import org.session.libsession.utilities.ViewUtil;
 

app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java

@@ -8,7 +8,7 @@ import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
 import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.net.ChunkedDataFetcher;
 import org.thoughtcrime.securesms.net.RequestController;
 

app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java

@@ -8,7 +8,7 @@ import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
-import org.session.libsession.messaging.avatars.ContactPhoto;
+import org.session.libsession.avatars.ContactPhoto;
 
 import java.io.IOException;
 import java.io.InputStream;

app/src/main/java/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java

@@ -9,7 +9,7 @@ import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
 import com.bumptech.glide.load.model.MultiModelLoaderFactory;
 
-import org.session.libsession.messaging.avatars.ContactPhoto;
+import org.session.libsession.avatars.ContactPhoto;
 
 import java.io.InputStream;
 

app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java

@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.glide.cache;
 import android.graphics.Bitmap;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.ResourceDecoder;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache;
 
 import android.graphics.Bitmap;
 import androidx.annotation.NonNull;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import com.bumptech.glide.load.EncodeStrategy;
 import com.bumptech.glide.load.Options;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java

@@ -7,7 +7,7 @@ import com.bumptech.glide.load.Encoder;
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool;
 
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.ResourceDecoder;

app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java

@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache;
 
 
 import androidx.annotation.NonNull;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Log;
 
 import com.bumptech.glide.load.EncodeStrategy;
 import com.bumptech.glide.load.Options;