Merge pull request #457 from hjubb/config_profile_info

Adding profile information to the config sync messages

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

@@ -50,7 +50,7 @@ import org.thoughtcrime.securesms.sskenvironment.TypingStatusRepository;
 import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;

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

@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsignal.metadata.SignalProtos;
 import org.session.libsignal.metadata.certificate.CertificateValidator;
 import org.session.libsignal.metadata.certificate.InvalidCertificateException;

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

@@ -18,7 +18,7 @@ import org.session.libsession.utilities.Util;
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.contactshare.ContactModelMapper;
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.session.libsession.utilities.preferences.ProfileKeyUtil;
 import org.session.libsession.messaging.threads.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.events.PartProgressEvent;

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

@@ -17,25 +17,26 @@ import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
+import androidx.core.view.isVisible
 import kotlinx.android.synthetic.main.activity_settings.*
 import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
 import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.all
 import nl.komponents.kovenant.deferred
+import nl.komponents.kovenant.functional.bind
+import nl.komponents.kovenant.task
 import nl.komponents.kovenant.ui.alwaysUi
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.session.libsession.messaging.threads.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog
 import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog
 import org.thoughtcrime.securesms.loki.dialogs.SeedDialog
 import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities
-import org.thoughtcrime.securesms.loki.utilities.fadeIn
-import org.thoughtcrime.securesms.loki.utilities.fadeOut
 import org.thoughtcrime.securesms.loki.utilities.push
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
@@ -48,6 +49,7 @@ import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.service.api.crypto.ProfileCipher
 import org.session.libsignal.service.api.util.StreamDetails
 import org.session.libsignal.service.loki.api.fileserver.FileServerAPI
+import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol
 import java.io.ByteArrayInputStream
 import java.io.File
 import java.security.SecureRandom
@@ -177,7 +179,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     }
 
     private fun updateProfile(isUpdatingProfilePicture: Boolean) {
-        loader.fadeIn()
+        loader.isVisible = true
         val promises = mutableListOf<Promise<*, Exception>>()
         val displayName = displayNameToBeUploaded
         if (displayName != null) {
@@ -204,7 +206,17 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             }
             promises.add(deferred.promise)
         }
-        all(promises).alwaysUi {
+
+        all(promises).bind {
+            // updating the profile name or picture
+            if (profilePicture != null || displayName != null) {
+                task {
+                    MultiDeviceProtocol.forceSyncConfigurationNowIfNeeded(this@SettingsActivity)
+                }
+            } else {
+                Promise.of(Unit)
+            }
+        }.alwaysUi {
             if (displayName != null) {
                 btnGroupNameDisplay.text = displayName
             }
@@ -217,7 +229,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
                 profilePictureView.update()
             }
             profilePictureToBeUploaded = null
-            loader.fadeOut()
+            loader.isVisible = false
         }
     }
     // endregion

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

@@ -90,6 +90,7 @@ object MultiDeviceProtocol {
             if (allOpenGroups.contains(openGroup)) continue
             OpenGroupUtilities.addGroup(context, openGroup, 1)
         }
+        // TODO: handle new configuration message fields or handle in new pipeline
         TextSecurePreferences.setConfigurationMessageSynced(context, true)
     }
 }

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

@@ -4,7 +4,7 @@ import android.content.Context
 import androidx.annotation.WorkerThread
 import org.greenrobot.eventbus.EventBus
 import org.thoughtcrime.securesms.ApplicationContext
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.session.libsession.utilities.GroupUtil

app/src/main/res/layout/activity_settings.xml

@@ -250,13 +250,16 @@
 
     </ScrollView>
 
+    <FrameLayout
+        android:animateLayoutChanges="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
         <RelativeLayout
             android:id="@+id/loader"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="#A4000000"
-        android:visibility="gone"
+            android:visibility="gone">
-        android:alpha="0">
 
             <com.github.ybq.android.spinkit.SpinKitView
                 style="@style/SpinKitView.Large.ThreeBounce"
@@ -268,4 +271,5 @@
 
         </RelativeLayout>
 
+    </FrameLayout>
 </RelativeLayout>

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

@@ -4,6 +4,8 @@ import com.google.protobuf.ByteString
 import org.session.libsession.messaging.MessagingConfiguration
 import org.session.libsession.messaging.threads.Address
 import org.session.libsession.utilities.GroupUtil
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
 import org.session.libsignal.libsignal.ecc.DjbECPrivateKey
 import org.session.libsignal.libsignal.ecc.DjbECPublicKey
 import org.session.libsignal.libsignal.ecc.ECKeyPair
@@ -12,7 +14,7 @@ import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded
 import org.session.libsignal.service.loki.utilities.toHexString
 import org.session.libsignal.utilities.Hex
 
-class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups: List<String>): ControlMessage() {
+class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups: List<String>, val displayName: String, val profilePicture: String?, val profileKey: ByteArray): ControlMessage() {
 
     class ClosedGroup(val publicKey: String, val name: String, val encryptionKeyPair: ECKeyPair, val members: List<String>, val admins: List<String>) {
         val isValid: Boolean get() = members.isNotEmpty() && admins.isNotEmpty()
@@ -57,7 +59,12 @@ class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups:
         fun getCurrent(): ConfigurationMessage {
             val closedGroups = mutableListOf<ClosedGroup>()
             val openGroups = mutableListOf<String>()
-            val storage = MessagingConfiguration.shared.storage
+            val sharedConfig = MessagingConfiguration.shared
+            val storage = sharedConfig.storage
+            val context = sharedConfig.context
+            val displayName = TextSecurePreferences.getProfileName(context)!!
+            val profilePicture = TextSecurePreferences.getProfilePictureURL(context)
+            val profileKey = ProfileKeyUtil.getProfileKey(context)
             val groups = storage.getAllGroups()
             for (groupRecord in groups) {
                 if (groupRecord.isClosedGroup) {
@@ -74,7 +81,8 @@ class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups:
                     openGroups.add(openGroup.server)
                 }
             }
-            return ConfigurationMessage(closedGroups, openGroups)
+
+            return ConfigurationMessage(closedGroups, openGroups, displayName, profilePicture, profileKey)
         }
 
         fun fromProto(proto: SignalServiceProtos.Content): ConfigurationMessage? {
@@ -82,7 +90,10 @@ class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups:
             val configurationProto = proto.configurationMessage
             val closedGroups = configurationProto.closedGroupsList.mapNotNull { ClosedGroup.fromProto(it) }
             val openGroups = configurationProto.openGroupsList
-            return ConfigurationMessage(closedGroups, openGroups)
+            val displayName = configurationProto.displayName
+            val profilePicture = configurationProto.profilePicture
+            val profileKey = configurationProto.profileKey
+            return ConfigurationMessage(closedGroups, openGroups, displayName, profilePicture, profileKey.toByteArray())
         }
     }
 
@@ -90,6 +101,9 @@ class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups:
         val configurationProto = SignalServiceProtos.ConfigurationMessage.newBuilder()
         configurationProto.addAllClosedGroups(closedGroups.mapNotNull { it.toProto() })
         configurationProto.addAllOpenGroups(openGroups)
+        configurationProto.displayName = displayName
+        configurationProto.profilePicture = profilePicture
+        configurationProto.profileKey = ByteString.copyFrom(profileKey)
         val contentProto = SignalServiceProtos.Content.newBuilder()
         contentProto.configurationMessage = configurationProto.build()
         return contentProto.build()
@@ -100,6 +114,9 @@ class ConfigurationMessage(val closedGroups: List<ClosedGroup>, val openGroups:
             ConfigurationMessage(
                 closedGroups: ${(closedGroups)}
                 openGroups: ${(openGroups)}
+                displayName: $displayName
+                profilePicture: $profilePicture
+                profileKey: $profileKey
             )
         """.trimIndent()
     }

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

@@ -117,6 +117,7 @@ private fun MessageReceiver.handleConfigurationMessage(message: ConfigurationMes
         if (allOpenGroups.contains(openGroup)) continue
         storage.addOpenGroup(openGroup, 1)
     }
+    // TODO: in future handle the latest in config messages
     TextSecurePreferences.setConfigurationMessageSynced(context, true)
 }
 

libsession/src/main/java/org/session/libsession/utilities/preferences/ProfileKeyUtil.java

@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.crypto;
+package org.session.libsession.utilities.preferences;
 
 
 import android.content.Context;

libsignal/protobuf/SignalService.proto

@@ -328,6 +328,9 @@ message ConfigurationMessage {
 
   repeated ClosedGroup closedGroups   = 1;
   repeated string      openGroups     = 2;
+  optional string      displayName    = 3;
+  optional string      profilePicture = 4;
+  optional bytes       profileKey     = 5;
 }
 
 message Verified {

libsignal/src/main/java/org/session/libsignal/service/internal/push/SignalServiceProtos.java

@@ -31599,6 +31599,46 @@ public final class SignalServiceProtos {
      */
     com.google.protobuf.ByteString
         getOpenGroupsBytes(int index);
+
+    // optional string displayName = 3;
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    boolean hasDisplayName();
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    java.lang.String getDisplayName();
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    com.google.protobuf.ByteString
+        getDisplayNameBytes();
+
+    // optional string profilePicture = 4;
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    boolean hasProfilePicture();
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    java.lang.String getProfilePicture();
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    com.google.protobuf.ByteString
+        getProfilePictureBytes();
+
+    // optional bytes profileKey = 5;
+    /**
+     * <code>optional bytes profileKey = 5;</code>
+     */
+    boolean hasProfileKey();
+    /**
+     * <code>optional bytes profileKey = 5;</code>
+     */
+    com.google.protobuf.ByteString getProfileKey();
   }
   /**
    * Protobuf type {@code signalservice.ConfigurationMessage}
@@ -31667,6 +31707,21 @@ public final class SignalServiceProtos {
               openGroups_.add(input.readBytes());
               break;
             }
+            case 26: {
+              bitField0_ |= 0x00000001;
+              displayName_ = input.readBytes();
+              break;
+            }
+            case 34: {
+              bitField0_ |= 0x00000002;
+              profilePicture_ = input.readBytes();
+              break;
+            }
+            case 42: {
+              bitField0_ |= 0x00000004;
+              profileKey_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -32771,6 +32826,7 @@ public final class SignalServiceProtos {
       // @@protoc_insertion_point(class_scope:signalservice.ConfigurationMessage.ClosedGroup)
     }
 
+    private int bitField0_;
     // repeated .signalservice.ConfigurationMessage.ClosedGroup closedGroups = 1;
     public static final int CLOSEDGROUPS_FIELD_NUMBER = 1;
     private java.util.List<org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage.ClosedGroup> closedGroups_;
@@ -32837,9 +32893,114 @@ public final class SignalServiceProtos {
       return openGroups_.getByteString(index);
     }
 
+    // optional string displayName = 3;
+    public static final int DISPLAYNAME_FIELD_NUMBER = 3;
+    private java.lang.Object displayName_;
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    public boolean hasDisplayName() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    public java.lang.String getDisplayName() {
+      java.lang.Object ref = displayName_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          displayName_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string displayName = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getDisplayNameBytes() {
+      java.lang.Object ref = displayName_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        displayName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional string profilePicture = 4;
+    public static final int PROFILEPICTURE_FIELD_NUMBER = 4;
+    private java.lang.Object profilePicture_;
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    public boolean hasProfilePicture() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    public java.lang.String getProfilePicture() {
+      java.lang.Object ref = profilePicture_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          profilePicture_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string profilePicture = 4;</code>
+     */
+    public com.google.protobuf.ByteString
+        getProfilePictureBytes() {
+      java.lang.Object ref = profilePicture_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        profilePicture_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    // optional bytes profileKey = 5;
+    public static final int PROFILEKEY_FIELD_NUMBER = 5;
+    private com.google.protobuf.ByteString profileKey_;
+    /**
+     * <code>optional bytes profileKey = 5;</code>
+     */
+    public boolean hasProfileKey() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional bytes profileKey = 5;</code>
+     */
+    public com.google.protobuf.ByteString getProfileKey() {
+      return profileKey_;
+    }
+
     private void initFields() {
       closedGroups_ = java.util.Collections.emptyList();
       openGroups_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+      displayName_ = "";
+      profilePicture_ = "";
+      profileKey_ = com.google.protobuf.ByteString.EMPTY;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -32865,6 +33026,15 @@ public final class SignalServiceProtos {
       for (int i = 0; i < openGroups_.size(); i++) {
         output.writeBytes(2, openGroups_.getByteString(i));
       }
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeBytes(3, getDisplayNameBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeBytes(4, getProfilePictureBytes());
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(5, profileKey_);
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -32887,6 +33057,18 @@ public final class SignalServiceProtos {
         size += dataSize;
         size += 1 * getOpenGroupsList().size();
       }
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getDisplayNameBytes());
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(4, getProfilePictureBytes());
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(5, profileKey_);
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -33012,6 +33194,12 @@ public final class SignalServiceProtos {
         }
         openGroups_ = com.google.protobuf.LazyStringArrayList.EMPTY;
         bitField0_ = (bitField0_ & ~0x00000002);
+        displayName_ = "";
+        bitField0_ = (bitField0_ & ~0x00000004);
+        profilePicture_ = "";
+        bitField0_ = (bitField0_ & ~0x00000008);
+        profileKey_ = com.google.protobuf.ByteString.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -33039,6 +33227,7 @@ public final class SignalServiceProtos {
       public org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage buildPartial() {
         org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage result = new org.session.libsignal.service.internal.push.SignalServiceProtos.ConfigurationMessage(this);
         int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
         if (closedGroupsBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
             closedGroups_ = java.util.Collections.unmodifiableList(closedGroups_);
@@ -33054,6 +33243,19 @@ public final class SignalServiceProtos {
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.openGroups_ = openGroups_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.displayName_ = displayName_;
+        if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.profilePicture_ = profilePicture_;
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.profileKey_ = profileKey_;
+        result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
       }
@@ -33105,6 +33307,19 @@ public final class SignalServiceProtos {
           }
           onChanged();
         }
+        if (other.hasDisplayName()) {
+          bitField0_ |= 0x00000004;
+          displayName_ = other.displayName_;
+          onChanged();
+        }
+        if (other.hasProfilePicture()) {
+          bitField0_ |= 0x00000008;
+          profilePicture_ = other.profilePicture_;
+          onChanged();
+        }
+        if (other.hasProfileKey()) {
+          setProfileKey(other.getProfileKey());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -33471,6 +33686,190 @@ public final class SignalServiceProtos {
         return this;
       }
 
+      // optional string displayName = 3;
+      private java.lang.Object displayName_ = "";
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public boolean hasDisplayName() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public java.lang.String getDisplayName() {
+        java.lang.Object ref = displayName_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          displayName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public com.google.protobuf.ByteString
+          getDisplayNameBytes() {
+        java.lang.Object ref = displayName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          displayName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public Builder setDisplayName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        displayName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public Builder clearDisplayName() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        displayName_ = getDefaultInstance().getDisplayName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string displayName = 3;</code>
+       */
+      public Builder setDisplayNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        displayName_ = value;
+        onChanged();
+        return this;
+      }
+
+      // optional string profilePicture = 4;
+      private java.lang.Object profilePicture_ = "";
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public boolean hasProfilePicture() {
+        return ((bitField0_ & 0x00000008) == 0x00000008);
+      }
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public java.lang.String getProfilePicture() {
+        java.lang.Object ref = profilePicture_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          profilePicture_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public com.google.protobuf.ByteString
+          getProfilePictureBytes() {
+        java.lang.Object ref = profilePicture_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          profilePicture_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public Builder setProfilePicture(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        profilePicture_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public Builder clearProfilePicture() {
+        bitField0_ = (bitField0_ & ~0x00000008);
+        profilePicture_ = getDefaultInstance().getProfilePicture();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string profilePicture = 4;</code>
+       */
+      public Builder setProfilePictureBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000008;
+        profilePicture_ = value;
+        onChanged();
+        return this;
+      }
+
+      // optional bytes profileKey = 5;
+      private com.google.protobuf.ByteString profileKey_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>optional bytes profileKey = 5;</code>
+       */
+      public boolean hasProfileKey() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional bytes profileKey = 5;</code>
+       */
+      public com.google.protobuf.ByteString getProfileKey() {
+        return profileKey_;
+      }
+      /**
+       * <code>optional bytes profileKey = 5;</code>
+       */
+      public Builder setProfileKey(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000010;
+        profileKey_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bytes profileKey = 5;</code>
+       */
+      public Builder clearProfileKey() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        profileKey_ = getDefaultInstance().getProfileKey();
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:signalservice.ConfigurationMessage)
     }
 
@@ -51805,87 +52204,88 @@ public final class SignalServiceProtos {
       "\"\214\001\n\rTypingMessage\022\021\n\ttimestamp\030\001 \001(\004\0223\n" +
       "\006action\030\002 \001(\0162#.signalservice.TypingMess",
       "age.Action\022\017\n\007groupId\030\003 \001(\014\"\"\n\006Action\022\013\n" +
-      "\007STARTED\020\000\022\013\n\007STOPPED\020\001\"\366\001\n\024Configuratio" +
+      "\007STARTED\020\000\022\013\n\007STOPPED\020\001\"\267\002\n\024Configuratio" +
       "nMessage\022E\n\014closedGroups\030\001 \003(\0132/.signals" +
       "ervice.ConfigurationMessage.ClosedGroup\022" +
-      "\022\n\nopenGroups\030\002 \003(\t\032\202\001\n\013ClosedGroup\022\021\n\tp" +
+      "\022\n\nopenGroups\030\002 \003(\t\022\023\n\013displayName\030\003 \001(\t" +
-      "ublicKey\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\0221\n\021encrypti" +
+      "\022\026\n\016profilePicture\030\004 \001(\t\022\022\n\nprofileKey\030\005" +
-      "onKeyPair\030\003 \001(\0132\026.signalservice.KeyPair\022" +
+      " \001(\014\032\202\001\n\013ClosedGroup\022\021\n\tpublicKey\030\001 \001(\014\022" +
-      "\017\n\007members\030\004 \003(\014\022\016\n\006admins\030\005 \003(\014\"\253\001\n\010Ver" +
+      "\014\n\004name\030\002 \001(\t\0221\n\021encryptionKeyPair\030\003 \001(\013" +
-      "ified\022\023\n\013destination\030\001 \001(\t\022\023\n\013identityKe" +
+      "2\026.signalservice.KeyPair\022\017\n\007members\030\004 \003(" +
-      "y\030\002 \001(\014\022,\n\005state\030\003 \001(\0162\035.signalservice.V",
+      "\014\022\016\n\006admins\030\005 \003(\014\"\253\001\n\010Verified\022\023\n\013destin",
-      "erified.State\022\023\n\013nullMessage\030\004 \001(\014\"2\n\005St" +
+      "ation\030\001 \001(\t\022\023\n\013identityKey\030\002 \001(\014\022,\n\005stat" +
-      "ate\022\013\n\007DEFAULT\020\000\022\014\n\010VERIFIED\020\001\022\016\n\nUNVERI" +
+      "e\030\003 \001(\0162\035.signalservice.Verified.State\022\023" +
-      "FIED\020\002\"\325\014\n\013SyncMessage\022-\n\004sent\030\001 \001(\0132\037.s" +
+      "\n\013nullMessage\030\004 \001(\014\"2\n\005State\022\013\n\007DEFAULT\020" +
-      "ignalservice.SyncMessage.Sent\0225\n\010contact" +
+      "\000\022\014\n\010VERIFIED\020\001\022\016\n\nUNVERIFIED\020\002\"\325\014\n\013Sync" +
-      "s\030\002 \001(\0132#.signalservice.SyncMessage.Cont" +
+      "Message\022-\n\004sent\030\001 \001(\0132\037.signalservice.Sy" +
-      "acts\0221\n\006groups\030\003 \001(\0132!.signalservice.Syn" +
+      "ncMessage.Sent\0225\n\010contacts\030\002 \001(\0132#.signa" +
-      "cMessage.Groups\0223\n\007request\030\004 \001(\0132\".signa" +
+      "lservice.SyncMessage.Contacts\0221\n\006groups\030" +
-      "lservice.SyncMessage.Request\022-\n\004read\030\005 \003" +
+      "\003 \001(\0132!.signalservice.SyncMessage.Groups" +
-      "(\0132\037.signalservice.SyncMessage.Read\0223\n\007b" +
+      "\0223\n\007request\030\004 \001(\0132\".signalservice.SyncMe" +
-      "locked\030\006 \001(\0132\".signalservice.SyncMessage",
+      "ssage.Request\022-\n\004read\030\005 \003(\0132\037.signalserv",
-      ".Blocked\022)\n\010verified\030\007 \001(\0132\027.signalservi" +
+      "ice.SyncMessage.Read\0223\n\007blocked\030\006 \001(\0132\"." +
-      "ce.Verified\022?\n\rconfiguration\030\t \001(\0132(.sig" +
+      "signalservice.SyncMessage.Blocked\022)\n\010ver" +
-      "nalservice.SyncMessage.Configuration\022\017\n\007" +
+      "ified\030\007 \001(\0132\027.signalservice.Verified\022?\n\r" +
-      "padding\030\010 \001(\014\022M\n\024stickerPackOperation\030\n " +
+      "configuration\030\t \001(\0132(.signalservice.Sync" +
-      "\003(\0132/.signalservice.SyncMessage.StickerP" +
+      "Message.Configuration\022\017\n\007padding\030\010 \001(\014\022M" +
-      "ackOperation\022?\n\nopenGroups\030d \003(\0132+.signa" +
+      "\n\024stickerPackOperation\030\n \003(\0132/.signalser" +
-      "lservice.SyncMessage.OpenGroupDetails\032\236\002" +
+      "vice.SyncMessage.StickerPackOperation\022?\n" +
-      "\n\004Sent\022\023\n\013destination\030\001 \001(\t\022\021\n\ttimestamp" +
+      "\nopenGroups\030d \003(\0132+.signalservice.SyncMe" +
-      "\030\002 \001(\004\022+\n\007message\030\003 \001(\0132\032.signalservice." +
+      "ssage.OpenGroupDetails\032\236\002\n\004Sent\022\023\n\013desti" +
-      "DataMessage\022 \n\030expirationStartTimestamp\030",
+      "nation\030\001 \001(\t\022\021\n\ttimestamp\030\002 \001(\004\022+\n\007messa",
-      "\004 \001(\004\022V\n\022unidentifiedStatus\030\005 \003(\0132:.sign" +
+      "ge\030\003 \001(\0132\032.signalservice.DataMessage\022 \n\030" +
-      "alservice.SyncMessage.Sent.UnidentifiedD" +
+      "expirationStartTimestamp\030\004 \001(\004\022V\n\022uniden" +
-      "eliveryStatus\032G\n\032UnidentifiedDeliverySta" +
+      "tifiedStatus\030\005 \003(\0132:.signalservice.SyncM" +
-      "tus\022\023\n\013destination\030\001 \001(\t\022\024\n\014unidentified" +
+      "essage.Sent.UnidentifiedDeliveryStatus\032G" +
-      "\030\002 \001(\010\032a\n\010Contacts\022.\n\004blob\030\001 \001(\0132 .signa" +
+      "\n\032UnidentifiedDeliveryStatus\022\023\n\013destinat" +
-      "lservice.AttachmentPointer\022\027\n\010complete\030\002" +
+      "ion\030\001 \001(\t\022\024\n\014unidentified\030\002 \001(\010\032a\n\010Conta" +
-      " \001(\010:\005false\022\014\n\004data\030e \001(\014\032F\n\006Groups\022.\n\004b" +
+      "cts\022.\n\004blob\030\001 \001(\0132 .signalservice.Attach" +
-      "lob\030\001 \001(\0132 .signalservice.AttachmentPoin" +
+      "mentPointer\022\027\n\010complete\030\002 \001(\010:\005false\022\014\n\004" +
-      "ter\022\014\n\004data\030e \001(\014\032,\n\007Blocked\022\017\n\007numbers\030" +
+      "data\030e \001(\014\032F\n\006Groups\022.\n\004blob\030\001 \001(\0132 .sig" +
-      "\001 \003(\t\022\020\n\010groupIds\030\002 \003(\014\032\217\001\n\007Request\0225\n\004t",
+      "nalservice.AttachmentPointer\022\014\n\004data\030e \001",
-      "ype\030\001 \001(\0162\'.signalservice.SyncMessage.Re" +
+      "(\014\032,\n\007Blocked\022\017\n\007numbers\030\001 \003(\t\022\020\n\010groupI" +
-      "quest.Type\"M\n\004Type\022\013\n\007UNKNOWN\020\000\022\014\n\010CONTA" +
+      "ds\030\002 \003(\014\032\217\001\n\007Request\0225\n\004type\030\001 \001(\0162\'.sig" +
-      "CTS\020\001\022\n\n\006GROUPS\020\002\022\013\n\007BLOCKED\020\003\022\021\n\rCONFIG" +
+      "nalservice.SyncMessage.Request.Type\"M\n\004T" +
-      "URATION\020\004\032)\n\004Read\022\016\n\006sender\030\001 \001(\t\022\021\n\ttim" +
+      "ype\022\013\n\007UNKNOWN\020\000\022\014\n\010CONTACTS\020\001\022\n\n\006GROUPS" +
-      "estamp\030\002 \001(\004\032}\n\rConfiguration\022\024\n\014readRec" +
+      "\020\002\022\013\n\007BLOCKED\020\003\022\021\n\rCONFIGURATION\020\004\032)\n\004Re" +
-      "eipts\030\001 \001(\010\022&\n\036unidentifiedDeliveryIndic" +
+      "ad\022\016\n\006sender\030\001 \001(\t\022\021\n\ttimestamp\030\002 \001(\004\032}\n" +
-      "ators\030\002 \001(\010\022\030\n\020typingIndicators\030\003 \001(\010\022\024\n" +
+      "\rConfiguration\022\024\n\014readReceipts\030\001 \001(\010\022&\n\036" +
-      "\014linkPreviews\030\004 \001(\010\032\234\001\n\024StickerPackOpera" +
+      "unidentifiedDeliveryIndicators\030\002 \001(\010\022\030\n\020" +
-      "tion\022\016\n\006packId\030\001 \001(\014\022\017\n\007packKey\030\002 \001(\014\022B\n" +
+      "typingIndicators\030\003 \001(\010\022\024\n\014linkPreviews\030\004" +
-      "\004type\030\003 \001(\01624.signalservice.SyncMessage.",
+      " \001(\010\032\234\001\n\024StickerPackOperation\022\016\n\006packId\030",
-      "StickerPackOperation.Type\"\037\n\004Type\022\013\n\007INS" +
+      "\001 \001(\014\022\017\n\007packKey\030\002 \001(\014\022B\n\004type\030\003 \001(\01624.s" +
-      "TALL\020\000\022\n\n\006REMOVE\020\001\0322\n\020OpenGroupDetails\022\013" +
+      "ignalservice.SyncMessage.StickerPackOper" +
-      "\n\003url\030\001 \001(\t\022\021\n\tchannelID\030\002 \001(\r\"\354\001\n\021Attac" +
+      "ation.Type\"\037\n\004Type\022\013\n\007INSTALL\020\000\022\n\n\006REMOV" +
-      "hmentPointer\022\n\n\002id\030\001 \001(\006\022\023\n\013contentType\030" +
+      "E\020\001\0322\n\020OpenGroupDetails\022\013\n\003url\030\001 \001(\t\022\021\n\t" +
-      "\002 \001(\t\022\013\n\003key\030\003 \001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthum" +
+      "channelID\030\002 \001(\r\"\354\001\n\021AttachmentPointer\022\n\n" +
-      "bnail\030\005 \001(\014\022\016\n\006digest\030\006 \001(\014\022\020\n\010fileName\030" +
+      "\002id\030\001 \001(\006\022\023\n\013contentType\030\002 \001(\t\022\013\n\003key\030\003 " +
-      "\007 \001(\t\022\r\n\005flags\030\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006h" +
+      "\001(\014\022\014\n\004size\030\004 \001(\r\022\021\n\tthumbnail\030\005 \001(\014\022\016\n\006" +
-      "eight\030\n \001(\r\022\017\n\007caption\030\013 \001(\t\022\013\n\003url\030e \001(" +
+      "digest\030\006 \001(\014\022\020\n\010fileName\030\007 \001(\t\022\r\n\005flags\030" +
-      "\t\"\032\n\005Flags\022\021\n\rVOICE_MESSAGE\020\001\"\243\002\n\014GroupC" +
+      "\010 \001(\r\022\r\n\005width\030\t \001(\r\022\016\n\006height\030\n \001(\r\022\017\n\007" +
-      "ontext\022\n\n\002id\030\001 \001(\014\022.\n\004type\030\002 \001(\0162 .signa",
+      "caption\030\013 \001(\t\022\013\n\003url\030e \001(\t\"\032\n\005Flags\022\021\n\rV",
-      "lservice.GroupContext.Type\022\014\n\004name\030\003 \001(\t" +
+      "OICE_MESSAGE\020\001\"\243\002\n\014GroupContext\022\n\n\002id\030\001 " +
-      "\022\017\n\007members\030\004 \003(\t\0220\n\006avatar\030\005 \001(\0132 .sign" +
+      "\001(\014\022.\n\004type\030\002 \001(\0162 .signalservice.GroupC" +
-      "alservice.AttachmentPointer\022\016\n\006admins\030\006 " +
+      "ontext.Type\022\014\n\004name\030\003 \001(\t\022\017\n\007members\030\004 \003" +
-      "\003(\t\022\023\n\nnewMembers\030\346\007 \003(\t\022\027\n\016removedMembe" +
+      "(\t\0220\n\006avatar\030\005 \001(\0132 .signalservice.Attac" +
-      "rs\030\347\007 \003(\t\"H\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE" +
+      "hmentPointer\022\016\n\006admins\030\006 \003(\t\022\023\n\nnewMembe" +
-      "\020\001\022\013\n\007DELIVER\020\002\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INF" +
+      "rs\030\346\007 \003(\t\022\027\n\016removedMembers\030\347\007 \003(\t\"H\n\004Ty" +
-      "O\020\004\"\231\002\n\016ContactDetails\022\016\n\006number\030\001 \001(\t\022\014" +
+      "pe\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n\007DELIVER\020\002" +
-      "\n\004name\030\002 \001(\t\0224\n\006avatar\030\003 \001(\0132$.signalser" +
+      "\022\010\n\004QUIT\020\003\022\020\n\014REQUEST_INFO\020\004\"\231\002\n\016Contact" +
-      "vice.ContactDetails.Avatar\022\r\n\005color\030\004 \001(" +
+      "Details\022\016\n\006number\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\0224\n" +
-      "\t\022)\n\010verified\030\005 \001(\0132\027.signalservice.Veri",
+      "\006avatar\030\003 \001(\0132$.signalservice.ContactDet",
-      "fied\022\022\n\nprofileKey\030\006 \001(\014\022\017\n\007blocked\030\007 \001(" +
+      "ails.Avatar\022\r\n\005color\030\004 \001(\t\022)\n\010verified\030\005" +
-      "\010\022\023\n\013expireTimer\030\010 \001(\r\022\020\n\010nickname\030e \001(\t" +
+      " \001(\0132\027.signalservice.Verified\022\022\n\nprofile" +
-      "\032-\n\006Avatar\022\023\n\013contentType\030\001 \001(\t\022\016\n\006lengt" +
+      "Key\030\006 \001(\014\022\017\n\007blocked\030\007 \001(\010\022\023\n\013expireTime" +
-      "h\030\002 \001(\r\"\367\001\n\014GroupDetails\022\n\n\002id\030\001 \001(\014\022\014\n\004" +
+      "r\030\010 \001(\r\022\020\n\010nickname\030e \001(\t\032-\n\006Avatar\022\023\n\013c" +
-      "name\030\002 \001(\t\022\017\n\007members\030\003 \003(\t\0222\n\006avatar\030\004 " +
+      "ontentType\030\001 \001(\t\022\016\n\006length\030\002 \001(\r\"\367\001\n\014Gro" +
-      "\001(\0132\".signalservice.GroupDetails.Avatar\022" +
+      "upDetails\022\n\n\002id\030\001 \001(\014\022\014\n\004name\030\002 \001(\t\022\017\n\007m" +
-      "\024\n\006active\030\005 \001(\010:\004true\022\023\n\013expireTimer\030\006 \001" +
+      "embers\030\003 \003(\t\0222\n\006avatar\030\004 \001(\0132\".signalser" +
-      "(\r\022\r\n\005color\030\007 \001(\t\022\017\n\007blocked\030\010 \001(\010\022\016\n\006ad" +
+      "vice.GroupDetails.Avatar\022\024\n\006active\030\005 \001(\010" +
-      "mins\030\t \003(\t\032-\n\006Avatar\022\023\n\013contentType\030\001 \001(" +
+      ":\004true\022\023\n\013expireTimer\030\006 \001(\r\022\r\n\005color\030\007 \001" +
-      "\t\022\016\n\006length\030\002 \001(\rBB\n+org.session.libsign",
+      "(\t\022\017\n\007blocked\030\010 \001(\010\022\016\n\006admins\030\t \003(\t\032-\n\006A",
-      "al.service.internal.pushB\023SignalServiceP" +
+      "vatar\022\023\n\013contentType\030\001 \001(\t\022\016\n\006length\030\002 \001" +
-      "rotos"
+      "(\rBB\n+org.session.libsignal.service.inte" +
+      "rnal.pushB\023SignalServiceProtos"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -52083,7 +52483,7 @@ public final class SignalServiceProtos {
           internal_static_signalservice_ConfigurationMessage_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_signalservice_ConfigurationMessage_descriptor,
-              new java.lang.String[] { "ClosedGroups", "OpenGroups", });
+              new java.lang.String[] { "ClosedGroups", "OpenGroups", "DisplayName", "ProfilePicture", "ProfileKey", });
           internal_static_signalservice_ConfigurationMessage_ClosedGroup_descriptor =
             internal_static_signalservice_ConfigurationMessage_descriptor.getNestedTypes().get(0);
           internal_static_signalservice_ConfigurationMessage_ClosedGroup_fieldAccessorTable = new