Merge branch 'specific-group-updates' into data-extraction-2

2025-08-11 21:17:42 +00:00 · 2021-04-20 15:42:04 +10:00
parent c8f42d3b8e 2b7cf7c1b4
commit 66e811ed75
27 changed files with 385 additions and 335 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/StorageProtocol.kt
@@ -35,6 +35,7 @@ interface StorageProtocol {
    fun setUserProfilePictureUrl(newProfilePicture: String)

    fun getProfileKeyForRecipient(recipientPublicKey: String): ByteArray?
+    fun getDisplayNameForRecipient(recipientPublicKey: String): String?
    fun setProfileKeyForRecipient(recipientPublicKey: String, profileKey: ByteArray)

    // Signal Protocol
@@ -117,9 +118,9 @@ interface StorageProtocol {
    fun removeClosedGroupPublicKey(groupPublicKey: String)
    fun addClosedGroupEncryptionKeyPair(encryptionKeyPair: ECKeyPair, groupPublicKey: String)
    fun removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: String)
-    fun insertIncomingInfoMessage(context: Context, senderPublicKey: String, groupID: String, type0: SignalServiceProtos.GroupContext.Type, type1: SignalServiceGroup.Type,
+    fun insertIncomingInfoMessage(context: Context, senderPublicKey: String, groupID: String, type: SignalServiceGroup.Type,
                                  name: String, members: Collection<String>, admins: Collection<String>, sentTimestamp: Long)
-    fun insertOutgoingInfoMessage(context: Context, groupID: String, type: SignalServiceProtos.GroupContext.Type, name: String,
+    fun insertOutgoingInfoMessage(context: Context, groupID: String, type: SignalServiceGroup.Type, name: String,
                                  members: Collection<String>, admins: Collection<String>, threadID: Long, sentTimestamp: Long)
    fun isClosedGroup(publicKey: String): Boolean
    fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList<ECKeyPair>
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt
@@ -33,6 +33,11 @@ class ExpirationTimerUpdate() : ControlMessage() {
        this.duration = duration
    }

+    internal constructor(duration: Int) : this() {
+        this.syncTarget = null
+        this.duration = duration
+    }
+
    // validation
    override fun isValid(): Boolean {
        if (!super.isValid()) return false
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingGroupMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingGroupMessage.java
@@ -4,11 +4,13 @@ import static org.session.libsignal.service.internal.push.SignalServiceProtos.Gr

 public class IncomingGroupMessage extends IncomingTextMessage {

-  private final GroupContext groupContext;
+  private final String groupID;
+  private final boolean updateMessage;

-  public IncomingGroupMessage(IncomingTextMessage base, GroupContext groupContext, String body) {
+  public IncomingGroupMessage(IncomingTextMessage base, String groupID, String body, boolean updateMessage) {
    super(base, body);
-    this.groupContext = groupContext;
+    this.groupID = groupID;
+    this.updateMessage = updateMessage;
  }

    @Override
@@ -16,12 +18,6 @@ public class IncomingGroupMessage extends IncomingTextMessage {
    return true;
  }

-  public boolean isUpdate() {
-    return groupContext.getType().getNumber() == GroupContext.Type.UPDATE_VALUE;
-  }
-
-  public boolean isQuit() {
-    return groupContext.getType().getNumber() == GroupContext.Type.QUIT_VALUE;
-  }
+  public boolean isUpdateMessage() { return updateMessage; }

 }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingExpirationUpdateMessage.java
@@ -1,6 +1,5 @@
 package org.session.libsession.messaging.messages.signal;

-import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate;
 import org.session.libsession.messaging.sending_receiving.attachments.Attachment;
 import org.session.libsession.messaging.threads.DistributionTypes;
 import org.session.libsession.messaging.threads.recipients.Recipient;
@@ -10,15 +9,13 @@ import java.util.LinkedList;

 public class OutgoingExpirationUpdateMessage extends OutgoingSecureMediaMessage {

-  public OutgoingExpirationUpdateMessage(Recipient recipient, long sentTimeMillis, long expiresIn) {
-    super(recipient, "", new LinkedList<Attachment>(), sentTimeMillis,
-          DistributionTypes.CONVERSATION, expiresIn, true, null, Collections.emptyList(),
-          Collections.emptyList());
-  }
+  private final String groupId;

-  public static OutgoingExpirationUpdateMessage from(ExpirationTimerUpdate message,
-                                          Recipient recipient) {
-    return new OutgoingExpirationUpdateMessage(recipient, message.getSentTimestamp(), message.getDuration() * 1000);
+  public OutgoingExpirationUpdateMessage(Recipient recipient,  long sentTimeMillis, long expiresIn, String groupId) {
+    super(recipient, "", new LinkedList<Attachment>(), sentTimeMillis,
+          DistributionTypes.CONVERSATION, expiresIn, null, Collections.emptyList(),
+          Collections.emptyList());
+    this.groupId = groupId;
  }

  @Override
@@ -26,4 +23,13 @@ public class OutgoingExpirationUpdateMessage extends OutgoingSecureMediaMessage
    return true;
  }

+  @Override
+  public boolean isGroup() {
+    return groupId != null;
+  }
+
+  public String getGroupId() {
+    return groupId;
+  }
+
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingGroupMediaMessage.java
@@ -19,56 +19,27 @@ import java.util.List;

 public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {

-  private final GroupContext group;
+  private final String groupID;
+  private final boolean isUpdateMessage;

  public OutgoingGroupMediaMessage(@NonNull Recipient recipient,
-                                   @NonNull String encodedGroupContext,
-                                   @NonNull List<Attachment> avatar,
-                                   long sentTimeMillis,
-                                   long expiresIn,
-                                   @Nullable QuoteModel quote,
-                                   @NonNull List<Contact> contacts,
-                                   @NonNull List<LinkPreview> previews)
-      throws IOException
-  {
-    super(recipient, encodedGroupContext, avatar, sentTimeMillis,
-          DistributionTypes.CONVERSATION, expiresIn, false, quote, contacts, previews);
-
-    this.group = GroupContext.parseFrom(Base64.decode(encodedGroupContext));
-  }
-
-  public OutgoingGroupMediaMessage(@NonNull Recipient recipient,
-                                   @NonNull GroupContext group,
-                                   @Nullable final Attachment avatar,
-                                   long expireIn,
-                                   @Nullable QuoteModel quote,
-                                   @NonNull List<Contact> contacts,
-                                   @NonNull List<LinkPreview> previews)
-  {
-    super(recipient, Base64.encodeBytes(group.toByteArray()),
-            new LinkedList<Attachment>() {{if (avatar != null) add(avatar);}},
-            System.currentTimeMillis(),
-            DistributionTypes.CONVERSATION, expireIn, false, quote, contacts, previews);
-
-    this.group = group;
-  }
-
-  public OutgoingGroupMediaMessage(@NonNull Recipient recipient,
-                                   @NonNull GroupContext group,
+                                   @NonNull String body,
+                                   @Nullable String groupId,
                                   @Nullable final Attachment avatar,
                                   long sentTime,
                                   long expireIn,
-                                   boolean expirationUpdate,
+                                   boolean updateMessage,
                                   @Nullable QuoteModel quote,
                                   @NonNull List<Contact> contacts,
                                   @NonNull List<LinkPreview> previews)
  {
-    super(recipient, Base64.encodeBytes(group.toByteArray()),
+    super(recipient, body,
          new LinkedList<Attachment>() {{if (avatar != null) add(avatar);}},
          sentTime,
-          DistributionTypes.CONVERSATION, expireIn, expirationUpdate, quote, contacts, previews);
+          DistributionTypes.CONVERSATION, expireIn, quote, contacts, previews);

-    this.group = group;
+    this.groupID = groupId;
+    this.isUpdateMessage = updateMessage;
  }

  @Override
@@ -76,15 +47,11 @@ public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {
    return true;
  }

-  public boolean isGroupUpdate() {
-    return group.getType().getNumber() == GroupContext.Type.UPDATE_VALUE;
+  public String getGroupId() {
+    return groupID;
  }

-  public boolean isGroupQuit() {
-    return group.getType().getNumber() == GroupContext.Type.QUIT_VALUE;
-  }
-
-  public GroupContext getGroupContext() {
-    return group;
+  public boolean isUpdateMessage() {
+    return isUpdateMessage;
  }
 }
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java
@@ -26,7 +26,6 @@ public class OutgoingMediaMessage {
  private   final int                       distributionType;
  private   final int                       subscriptionId;
  private   final long                      expiresIn;
-  private   final boolean                   expirationUpdate;
  private   final QuoteModel                outgoingQuote;

  private   final List<NetworkFailure>      networkFailures       = new LinkedList<>();
@@ -37,7 +36,6 @@ public class OutgoingMediaMessage {
  public OutgoingMediaMessage(Recipient recipient, String message,
                              List<Attachment> attachments, long sentTimeMillis,
                              int subscriptionId, long expiresIn,
-                              boolean expirationUpdate,
                              int distributionType,
                              @Nullable QuoteModel outgoingQuote,
                              @NonNull List<Contact> contacts,
@@ -52,7 +50,6 @@ public class OutgoingMediaMessage {
    this.attachments           = attachments;
    this.subscriptionId        = subscriptionId;
    this.expiresIn             = expiresIn;
-    this.expirationUpdate      = expirationUpdate;
    this.outgoingQuote         = outgoingQuote;

    this.contacts.addAll(contacts);
@@ -69,7 +66,6 @@ public class OutgoingMediaMessage {
    this.sentTimeMillis      = that.sentTimeMillis;
    this.subscriptionId      = that.subscriptionId;
    this.expiresIn           = that.expiresIn;
-    this.expirationUpdate    = that.expirationUpdate;
    this.outgoingQuote       = that.outgoingQuote;

    this.identityKeyMismatches.addAll(that.identityKeyMismatches);
@@ -89,7 +85,7 @@ public class OutgoingMediaMessage {
      previews = Collections.singletonList(linkPreview);
    }
    return new OutgoingMediaMessage(recipient, message.getText(), attachments, message.getSentTimestamp(), -1,
-            recipient.getExpireMessages() * 1000, false, DistributionTypes.DEFAULT, outgoingQuote, Collections.emptyList(),
+            recipient.getExpireMessages() * 1000, DistributionTypes.DEFAULT, outgoingQuote, Collections.emptyList(),
            previews, Collections.emptyList(), Collections.emptyList());
  }

@@ -113,7 +109,7 @@ public class OutgoingMediaMessage {
    return false;
  }

-  public boolean isExpirationUpdate() { return expirationUpdate; }
+  public boolean isExpirationUpdate() { return false; }

  public long getSentTimeMillis() {
    return sentTimeMillis;
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingSecureMediaMessage.java
@@ -19,12 +19,11 @@ public class OutgoingSecureMediaMessage extends OutgoingMediaMessage {
                                    long sentTimeMillis,
                                    int distributionType,
                                    long expiresIn,
-                                    boolean expirationUpdate,
                                    @Nullable QuoteModel quote,
                                    @NonNull List<Contact> contacts,
                                    @NonNull List<LinkPreview> previews)
  {
-    super(recipient, body, attachments, sentTimeMillis, -1, expiresIn, expirationUpdate, distributionType, quote, contacts, previews, Collections.emptyList(), Collections.emptyList());
+    super(recipient, body, attachments, sentTimeMillis, -1, expiresIn, distributionType, quote, contacts, previews, Collections.emptyList(), Collections.emptyList());
  }

  public OutgoingSecureMediaMessage(OutgoingMediaMessage base) {
--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiverHandler.kt
@@ -264,8 +264,15 @@ private fun handleNewClosedGroup(sender: String, sentTimestamp: Long, groupPubli
    } else {
        storage.createGroup(groupID, name, LinkedList(members.map { Address.fromSerialized(it) }),
                null, null, LinkedList(admins.map { Address.fromSerialized(it) }), formationTimestamp)
+        val userPublicKey = TextSecurePreferences.getLocalNumber(context)
        // Notify the user
-        storage.insertIncomingInfoMessage(context, sender, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, SignalServiceGroup.Type.UPDATE, name, members, admins, sentTimestamp)
+        if (userPublicKey == sender) {
+            // sender is a linked device
+            val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
+            storage.insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.CREATION, name, members, admins, threadID, sentTimestamp)
+        } else {
+            storage.insertIncomingInfoMessage(context, sender, groupID, SignalServiceGroup.Type.CREATION, name, members, admins, sentTimestamp)
+        }
    }
    storage.setProfileSharing(Address.fromSerialized(groupID), true)
    // Add the group to the user's set of public keys to poll for
@@ -325,9 +332,8 @@ private fun MessageReceiver.handleClosedGroupUpdated(message: ClosedGroupControl
    }
    // Notify the user
    val wasSenderRemoved = !members.contains(senderPublicKey)
-    val type0 = if (wasSenderRemoved) SignalServiceProtos.GroupContext.Type.QUIT else SignalServiceProtos.GroupContext.Type.UPDATE
-    val type1 = if (wasSenderRemoved) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.UPDATE
-    storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, type0, type1, name, members, group.admins.map { it.toString() }, message.sentTimestamp!!)
+    val type = if (wasSenderRemoved) SignalServiceGroup.Type.QUIT else SignalServiceGroup.Type.MEMBER_REMOVED
+    storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, type, name, members, group.admins.map { it.toString() }, message.sentTimestamp!!)
 }

 private fun MessageReceiver.handleClosedGroupEncryptionKeyPair(message: ClosedGroupControlMessage) {
@@ -399,9 +405,9 @@ private fun MessageReceiver.handleClosedGroupNameChanged(message: ClosedGroupCon
    if (userPublicKey == senderPublicKey) {
        // sender is a linked device
        val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, name, members, admins, threadID, message.sentTimestamp!!)
+        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.NAME_CHANGE, name, members, admins, threadID, message.sentTimestamp!!)
    } else {
-        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, SignalServiceGroup.Type.UPDATE, name, members, admins, message.sentTimestamp!!)
+        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.NAME_CHANGE, name, members, admins, message.sentTimestamp!!)
    }
 }

@@ -434,9 +440,9 @@ private fun MessageReceiver.handleClosedGroupMembersAdded(message: ClosedGroupCo
    if (userPublicKey == senderPublicKey) {
        // sender is a linked device
        val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, name, members, admins, threadID, message.sentTimestamp!!)
+        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.MEMBER_ADDED, name, updateMembers, admins, threadID, message.sentTimestamp!!)
    } else {
-        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, SignalServiceGroup.Type.UPDATE, name, members, admins, message.sentTimestamp!!)
+        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.MEMBER_ADDED, name, updateMembers, admins, message.sentTimestamp!!)
    }
    if (userPublicKey in admins) {
        // send current encryption key to the latest added members
@@ -498,17 +504,16 @@ private fun MessageReceiver.handleClosedGroupMembersRemoved(message: ClosedGroup
            MessageSender.generateAndSendNewEncryptionKeyPair(groupPublicKey, newMembers)
        }
    }
-    val (contextType, signalType) =
-            if (senderLeft) SignalServiceProtos.GroupContext.Type.QUIT to SignalServiceGroup.Type.QUIT
-            else SignalServiceProtos.GroupContext.Type.UPDATE to SignalServiceGroup.Type.UPDATE
+    val type = if (senderLeft) SignalServiceGroup.Type.QUIT
+            else SignalServiceGroup.Type.MEMBER_REMOVED

    // Notify the user
    if (userPublicKey == senderPublicKey) {
        // sender is a linked device
        val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-        storage.insertOutgoingInfoMessage(context, groupID, contextType, name, members, admins, threadID, message.sentTimestamp!!)
+        storage.insertOutgoingInfoMessage(context, groupID, type, name, updateMembers, admins, threadID, message.sentTimestamp!!)
    } else {
-        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, contextType, signalType, name, members, admins, message.sentTimestamp!!)
+        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, type, name, updateMembers, admins, message.sentTimestamp!!)
    }
 }

@@ -554,9 +559,9 @@ private fun MessageReceiver.handleClosedGroupMemberLeft(message: ClosedGroupCont
    if (userLeft) {
        //sender is a linked device
        val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceProtos.GroupContext.Type.QUIT, name, members, admins, threadID, message.sentTimestamp!!)
+        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.QUIT, name, members, admins, threadID, message.sentTimestamp!!)
    } else {
-        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceProtos.GroupContext.Type.QUIT, SignalServiceGroup.Type.QUIT, name, members, admins, message.sentTimestamp!!)
+        storage.insertIncomingInfoMessage(context, senderPublicKey, groupID, SignalServiceGroup.Type.QUIT, name, members, admins, message.sentTimestamp!!)
    }
 }

--- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroup.kt
@@ -15,6 +15,7 @@ import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.libsignal.ecc.Curve
 import org.session.libsignal.libsignal.ecc.ECKeyPair
 import org.session.libsignal.libsignal.util.guava.Optional
+import org.session.libsignal.service.api.messages.SignalServiceGroup
 import org.session.libsignal.service.internal.push.SignalServiceProtos
 import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey
 import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
@@ -60,7 +61,7 @@ fun MessageSender.create(name: String, members: Collection<String>): Promise<Str
        storage.addClosedGroupEncryptionKeyPair(encryptionKeyPair, groupPublicKey)
        // Notify the user
        val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceProtos.GroupContext.Type.UPDATE, name, members, admins, threadID, sentTime)
+        storage.insertOutgoingInfoMessage(context, groupID, SignalServiceGroup.Type.CREATION, name, members, admins, threadID, sentTime)
        // Notify the PN server
        PushNotificationAPI.performOperation(PushNotificationAPI.ClosedGroupOperation.Subscribe, groupPublicKey, userPublicKey)
        // Fulfill the promise
@@ -107,7 +108,7 @@ fun MessageSender.setName(groupPublicKey: String, newName: String) {
    // Update the group
    storage.updateTitle(groupID, newName)
    // Notify the user
-    val infoType = SignalServiceProtos.GroupContext.Type.UPDATE
+    val infoType = SignalServiceGroup.Type.NAME_CHANGE
    val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
    storage.insertOutgoingInfoMessage(context, groupID, infoType, newName, members, admins, threadID, sentTime)
 }
@@ -150,9 +151,9 @@ fun MessageSender.addMembers(groupPublicKey: String, membersToAdd: List<String>)
        send(closedGroupControlMessage, Address.fromSerialized(member))
    }
    // Notify the user
-    val infoType = SignalServiceProtos.GroupContext.Type.UPDATE
+    val infoType = SignalServiceGroup.Type.MEMBER_ADDED
    val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-    storage.insertOutgoingInfoMessage(context, groupID, infoType, name, updatedMembers, admins, threadID, sentTime)
+    storage.insertOutgoingInfoMessage(context, groupID, infoType, name, membersToAdd, admins, threadID, sentTime)
 }

 fun MessageSender.removeMembers(groupPublicKey: String, membersToRemove: List<String>) {
@@ -189,9 +190,9 @@ fun MessageSender.removeMembers(groupPublicKey: String, membersToRemove: List<St
        generateAndSendNewEncryptionKeyPair(groupPublicKey, updatedMembers)
    }
    // Notify the user
-    val infoType = SignalServiceProtos.GroupContext.Type.UPDATE
+    val infoType = SignalServiceGroup.Type.MEMBER_REMOVED
    val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
-    storage.insertOutgoingInfoMessage(context, groupID, infoType, name, updatedMembers, admins, threadID, sentTime)
+    storage.insertOutgoingInfoMessage(context, groupID, infoType, name, membersToRemove, admins, threadID, sentTime)
 }

 fun MessageSender.leave(groupPublicKey: String, notifyUser: Boolean = true): Promise<Unit, Exception> {
@@ -212,7 +213,7 @@ fun MessageSender.leave(groupPublicKey: String, notifyUser: Boolean = true): Pro
        storage.setActive(groupID, false)
        sendNonDurably(closedGroupControlMessage, Address.fromSerialized(groupID)).success {
            // Notify the user
-            val infoType = SignalServiceProtos.GroupContext.Type.QUIT
+            val infoType = SignalServiceGroup.Type.QUIT
            val threadID = storage.getOrCreateThreadIdFor(Address.fromSerialized(groupID))
            if (notifyUser) {
                storage.insertOutgoingInfoMessage(context, groupID, infoType, name, updatedMembers, admins, threadID, sentTime)
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -0,0 +1,100 @@
+package org.session.libsession.messaging.utilities
+
+import android.content.Context
+import org.session.libsession.R
+import org.session.libsession.messaging.MessagingConfiguration
+import org.session.libsession.utilities.ExpirationUtil
+import org.session.libsignal.service.api.messages.SignalServiceGroup
+
+object UpdateMessageBuilder {
+
+    fun buildGroupUpdateMessage(context: Context, updateMessageData: UpdateMessageData, sender: String? = null, isOutgoing: Boolean = false): String {
+        var message: String = ""
+        val updateData = updateMessageData.kind as? UpdateMessageData.Kind.GroupUpdate ?: return message
+        val updateType = updateData.type
+        if (!isOutgoing && sender == null) return message
+        val senderName: String? = if (!isOutgoing) {
+            MessagingConfiguration.shared.storage.getDisplayNameForRecipient(sender!!) ?: sender
+        } else { context.getString(R.string.MessageRecord_you) }
+
+        when (updateType) {
+            SignalServiceGroup.Type.CREATION -> {
+                message = if (isOutgoing) {
+                    context.getString(R.string.MessageRecord_you_created_a_new_group)
+                } else {
+                    context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName)
+                }
+            }
+            SignalServiceGroup.Type.NAME_CHANGE -> {
+                message = if (isOutgoing) {
+                    context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.groupName)
+                } else {
+                    context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.groupName)
+                }
+            }
+            SignalServiceGroup.Type.MEMBER_ADDED -> {
+                val members = updateData.updatedMembers.joinToString(", ") {
+                    MessagingConfiguration.shared.storage.getDisplayNameForRecipient(it) ?: it
+                }
+                message = if (isOutgoing) {
+                    context.getString(R.string.MessageRecord_you_added_s_to_the_group, members)
+                } else {
+                    context.getString(R.string.MessageRecord_s_added_s_to_the_group, senderName, members)
+                }
+            }
+            SignalServiceGroup.Type.MEMBER_REMOVED -> {
+                val storage = MessagingConfiguration.shared.storage
+                val userPublicKey = storage.getUserPublicKey()!!
+                // 1st case: you are part of the removed members
+                message = if (userPublicKey in updateData.updatedMembers) {
+                    if (isOutgoing) {
+                        context.getString(R.string.MessageRecord_left_group)
+                    } else {
+                        context.getString(R.string.MessageRecord_you_were_removed_from_the_group)
+                    }
+                } else {
+                    // 2nd case: you are not part of the removed members
+                    val members = updateData.updatedMembers.joinToString(", ") {
+                        storage.getDisplayNameForRecipient(it) ?: it
+                    }
+                    if (isOutgoing) {
+                        context.getString(R.string.MessageRecord_you_removed_s_from_the_group, members)
+                    } else {
+                        context.getString(R.string.MessageRecord_s_removed_s_from_the_group, senderName, members)
+                    }
+                }
+            }
+            SignalServiceGroup.Type.QUIT -> {
+                message = if (isOutgoing) {
+                    context.getString(R.string.MessageRecord_left_group)
+                } else {
+                    context.getString(R.string.ConversationItem_group_action_left, senderName)
+                }
+            }
+            else -> {
+                message = context.getString(R.string.MessageRecord_s_updated_group, senderName)
+            }
+        }
+        return message
+    }
+
+    fun buildExpirationTimerMessage(context: Context, duration: Long, sender: String? = null, isOutgoing: Boolean = false): String {
+        if (!isOutgoing && sender == null) return ""
+        val senderName: String? = if (!isOutgoing) {
+            MessagingConfiguration.shared.storage.getDisplayNameForRecipient(sender!!) ?: sender
+        } else { sender }
+        return if (duration <= 0) {
+            if (isOutgoing) context.getString(R.string.MessageRecord_you_disabled_disappearing_messages)
+            else context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, senderName)
+        } else {
+            val time = ExpirationUtil.getExpirationDisplayValue(context, duration.toInt())
+            if (isOutgoing)context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time)
+            else context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, senderName, time)
+        }
+    }
+
+    //TODO do this when the current update is merged
+    fun buildDataExtractionMessage(): String {
+        return ""
+    }
+}
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt
@@ -0,0 +1,56 @@
+package org.session.libsession.messaging.utilities
+
+import com.fasterxml.jackson.annotation.JsonSubTypes
+import com.fasterxml.jackson.annotation.JsonTypeInfo
+import com.fasterxml.jackson.core.JsonParseException
+import org.session.libsignal.service.api.messages.SignalServiceGroup
+import org.session.libsignal.utilities.JsonUtil
+import org.session.libsignal.utilities.logging.Log
+import java.util.*
+
+// class used to save update messages details
+class UpdateMessageData () {
+
+    var kind: Kind? = null
+
+    //the annotations below are required for serialization. Any new Kind class MUST be declared as JsonSubTypes as well
+    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME)
+    @JsonSubTypes(
+            JsonSubTypes.Type(Kind.GroupUpdate::class, name = "GroupUpdate")
+    )
+    sealed class Kind {
+        class GroupUpdate( var type: SignalServiceGroup.Type, var groupName: String?, var updatedMembers: Collection<String>): Kind() {
+            constructor(): this(SignalServiceGroup.Type.UNKNOWN, null, Collections.emptyList()) //default constructor required for json serialization
+        }
+    }
+
+    constructor(kind: Kind): this() {
+        this.kind = kind
+    }
+
+    companion object {
+        val TAG = UpdateMessageData::class.simpleName
+
+        fun buildGroupUpdate(type: SignalServiceGroup.Type, name: String, members: Collection<String>): UpdateMessageData {
+            return when(type) {
+                SignalServiceGroup.Type.NAME_CHANGE -> UpdateMessageData(Kind.GroupUpdate(type, name, Collections.emptyList()))
+                SignalServiceGroup.Type.MEMBER_ADDED -> UpdateMessageData(Kind.GroupUpdate(type,null, members))
+                SignalServiceGroup.Type.MEMBER_REMOVED -> UpdateMessageData(Kind.GroupUpdate(type,null, members))
+                else -> UpdateMessageData(Kind.GroupUpdate(type,null, Collections.emptyList()))
+            }
+        }
+
+        fun fromJSON(json: String): UpdateMessageData {
+             return try {
+                JsonUtil.fromJson(json, UpdateMessageData::class.java)
+            } catch (e: JsonParseException) {
+                Log.e(TAG, "${e.message}")
+                UpdateMessageData(Kind.GroupUpdate(SignalServiceGroup.Type.UNKNOWN, null, Collections.emptyList()))
+            }
+        }
+    }
+
+    fun toJSON(): String {
+        return JsonUtil.toJson(this)
+    }
+}
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -487,6 +487,16 @@
    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Received a message encrypted using an old version of Session that is no longer supported. Please ask the sender to update to the most recent version and resend the message.</string>
    <string name="MessageRecord_left_group">You have left the group.</string>
    <string name="MessageRecord_you_updated_group">You updated the group.</string>
+    <string name="MessageRecord_you_created_a_new_group">You created a new group.</string>
+    <string name="MessageRecord_s_added_you_to_the_group">%1$s added you to the group.</string>
+    <string name="MessageRecord_you_renamed_the_group_to_s">You renamed the group to %1$s</string>
+    <string name="MessageRecord_s_renamed_the_group_to_s">%1$s renamed the group to: %2$s</string>
+    <string name="MessageRecord_you_added_s_to_the_group">You added %1$s to the group.</string>
+    <string name="MessageRecord_s_added_s_to_the_group">%1$s added %2$s to the group.</string>
+    <string name="MessageRecord_you_removed_s_from_the_group">You removed %1$s from the group.</string>
+    <string name="MessageRecord_s_removed_s_from_the_group">%1$s removed %2$s from the group.</string>
+    <string name="MessageRecord_you_were_removed_from_the_group">You were removed from the group.</string>
+    <string name="MessageRecord_you">You</string>
    <string name="MessageRecord_you_called">You called</string>
    <string name="MessageRecord_called_you">Contact called</string>
    <string name="MessageRecord_missed_call">Missed call</string>