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

2025-12-27 15:38:26 +00:00 · 2021-05-20 11:15:24 +10:00
parent c82a76b912 7e10910862
commit 38ed5c2187
1536 changed files with 48410 additions and 85442 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/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.logging.Log;
+import org.session.libsignal.utilities.ExternalStorageUtil;
+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();

--- a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java
+++ b/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.libsession.messaging.threads.Address;
+import org.session.libsignal.utilities.Log;
+import org.session.libsession.utilities.Address;
 import org.thoughtcrime.securesms.util.LRUCache;

 import java.util.HashMap;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/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.messaging.threads.Address;
-import org.session.libsession.messaging.threads.GroupRecord;
-import org.session.libsession.utilities.GroupUtil;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsession.utilities.Address;
+import org.session.libsession.utilities.GroupRecord;
 import org.session.libsession.utilities.Util;

-import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer;
-import org.session.libsignal.service.loki.LokiOpenGroupDatabaseProtocol;
+import org.session.libsignal.utilities.guava.Optional;
+import org.session.libsignal.messages.SignalServiceAttachmentPointer;
+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, ','));
--- a/app/src/main/java/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
+++ b/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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/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;

--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java
+++ b/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.database.documents.IdentityKeyMismatch;
-import org.session.libsession.database.documents.IdentityKeyMismatchList;
+import org.session.libsession.utilities.Document;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.session.libsignal.utilities.logging.Log;
-import org.session.libsignal.libsignal.IdentityKey;
+import org.session.libsignal.utilities.Log;
+import org.session.libsignal.crypto.IdentityKey;

-import org.session.libsession.messaging.threads.Address;
+import org.session.libsession.utilities.Address;
 import org.session.libsignal.utilities.JsonUtil;

 import java.io.IOException;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -37,10 +37,10 @@ import org.json.JSONObject;
 import org.session.libsession.utilities.GroupUtil;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.MmsNotificationAttachment;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
-import org.session.libsession.database.documents.IdentityKeyMismatchList;
-import org.session.libsession.database.documents.NetworkFailure;
-import org.session.libsession.database.documents.NetworkFailureList;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
+import org.session.libsession.utilities.NetworkFailure;
+import org.session.libsession.utilities.NetworkFailureList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -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.messaging.threads.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.RecipientFormattingException;
+import org.session.libsession.utilities.Address;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsession.utilities.recipients.RecipientFormattingException;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 import org.session.libsession.utilities.Util;

-import org.session.libsignal.utilities.logging.Log;
-import org.session.libsignal.libsignal.util.guava.Optional;
+import org.session.libsignal.utilities.Log;
+import org.session.libsignal.utilities.guava.Optional;

 import java.io.Closeable;
 import java.io.IOException;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsColumns.java
+++ b/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;
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java
+++ b/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.service.api.messages.SignalServiceEnvelope;
-import org.session.libsignal.service.internal.util.Util;
+import org.session.libsignal.utilities.guava.Optional;
+import org.session.libsignal.messages.SignalServiceEnvelope;
+import org.session.libsignal.utilities.Util;

 import java.io.IOException;

--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/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.messaging.threads.Address;
-import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.Recipient.*;
+import org.session.libsession.utilities.MaterialColor;
+import org.session.libsession.utilities.Address;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient.*;
 import org.session.libsignal.utilities.Base64;
 import org.session.libsession.utilities.Util;

-import org.session.libsignal.libsignal.util.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.guava.Optional;
+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 {

--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/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.database.documents.IdentityKeyMismatchList;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.IdentityKeyMismatchList;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
@@ -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.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.Address;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsignal.utilities.JsonUtil;
 import org.session.libsession.utilities.TextSecurePreferences;
 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      (forceSms)                  type |= Types.MESSAGE_FORCE_SMS_BIT;
+    if (message.isSecureMessage())       type |= (Types.SECURE_MESSAGE_BIT | Types.PUSH_MESSAGE_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);
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import android.content.Context
 import android.net.Uri
 import okhttp3.HttpUrl
-import org.session.libsession.messaging.StorageProtocol
+import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.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.messaging.threads.Address.Companion.fromSerialized
-import org.session.libsession.messaging.threads.GroupRecord
-import org.session.libsession.messaging.threads.recipients.Recipient
-import org.session.libsession.messaging.utilities.ClosedGroupUpdateMessageData
+import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.Address.Companion.fromSerialized
+import org.session.libsession.utilities.GroupRecord
+import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsession.messaging.utilities.UpdateMessageData
 import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.IdentityKeyUtil
 import org.session.libsession.utilities.TextSecurePreferences
-import org.session.libsession.utilities.preferences.ProfileKeyUtil
-import org.session.libsignal.libsignal.ecc.ECKeyPair
-import org.session.libsignal.libsignal.util.KeyHelper
-import org.session.libsignal.libsignal.util.guava.Optional
-import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer
-import org.session.libsignal.service.api.messages.SignalServiceGroup
+import org.session.libsession.utilities.ProfileKeyUtil
+import org.session.libsignal.crypto.ecc.ECKeyPair
+import org.session.libsignal.utilities.KeyHelper
+import org.session.libsignal.utilities.guava.Optional
+import org.session.libsignal.messages.SignalServiceAttachmentPointer
+import org.session.libsignal.messages.SignalServiceGroup
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
+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
        }
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/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.messaging.sending_receiving.sharecontacts.Contact;
-import org.session.libsession.messaging.threads.Address;
-import org.session.libsession.messaging.threads.GroupRecord;
-import org.session.libsession.messaging.threads.recipients.Recipient;
-import org.session.libsession.messaging.threads.recipients.Recipient.RecipientSettings;
+import org.session.libsession.utilities.DistributionTypes;
+import org.session.libsession.utilities.Contact;
+import org.session.libsession.utilities.Address;
+import org.session.libsession.utilities.GroupRecord;
+import org.session.libsession.utilities.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient.RecipientSettings;
 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.libsignal.util.guava.Optional;
-import org.session.libsignal.utilities.logging.Log;
+import org.session.libsignal.utilities.Pair;
+import org.session.libsignal.utilities.guava.Optional;
+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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
+++ b/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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ConversationLoader.java
+++ b/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;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
@@ -12,7 +12,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.thoughtcrime.securesms.util.AsyncLoader;

 public class PagingMediaLoader extends AsyncLoader<Pair<Cursor, Integer>> {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
+++ b/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 {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -22,7 +22,7 @@ import android.text.SpannableString;

 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;

 /**
 * The base class for all message record models.  Encapsulates basic data
@@ -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);
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
+++ b/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.database.documents.NetworkFailure;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;

 import java.util.List;

--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/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.ClosedGroupUpdateMessageData;
+import org.session.libsession.messaging.utilities.UpdateMessageBuilder;
+import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.NetworkFailure;

-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;

 import java.util.List;

@@ -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());
-      return new SpannableString(ClosedGroupUpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
+      UpdateMessageData updateMessageData = UpdateMessageData.Companion.fromJSON(getBody());
+      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())));
-      else if (isMediaSavedExtraction()) return new SpannableString((ClosedGroupUpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
+      if (isScreenshotExtraction()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, 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()) {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
+++ b/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.database.documents.NetworkFailure;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;

--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
@@ -23,10 +23,10 @@ import android.text.SpannableString;
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase.Status;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
-import org.session.libsession.database.documents.NetworkFailure;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.NetworkFailure;
 import org.thoughtcrime.securesms.mms.SlideDeck;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;

 import java.util.Collections;
 import java.util.LinkedList;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/Quote.java
+++ b/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 {
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
@@ -24,8 +24,8 @@ import androidx.annotation.NonNull;

 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.session.libsession.database.documents.IdentityKeyMismatch;
-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.IdentityKeyMismatch;
+import org.session.libsession.utilities.recipients.Recipient;

 import java.util.LinkedList;
 import java.util.List;
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -27,7 +27,7 @@ import android.text.style.StyleSpan;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import org.session.libsession.messaging.threads.recipients.Recipient;
+import org.session.libsession.utilities.recipients.Recipient;
 import org.session.libsession.utilities.ExpirationUtil;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
@@ -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)) {