refactor: move ProfileKeyUtil from app/ to libsession/ module and implement new config message sends

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

@@ -0,0 +1,55 @@
+package org.session.libsession.utilities.preferences;
+
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.session.libsignal.utilities.Base64;
+import org.session.libsession.utilities.TextSecurePreferences;
+import org.session.libsession.utilities.Util;
+
+import java.io.IOException;
+
+public class ProfileKeyUtil {
+
+  public static synchronized boolean hasProfileKey(@NonNull Context context) {
+    return TextSecurePreferences.getProfileKey(context) != null;
+  }
+
+  public static synchronized @NonNull byte[] getProfileKey(@NonNull Context context) {
+    try {
+      String encodedProfileKey = TextSecurePreferences.getProfileKey(context);
+
+      if (encodedProfileKey == null) {
+        encodedProfileKey = Util.getSecret(32);
+        TextSecurePreferences.setProfileKey(context, encodedProfileKey);
+      }
+
+      return Base64.decode(encodedProfileKey);
+    } catch (IOException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public static synchronized @NonNull byte[] getProfileKeyFromEncodedString(String encodedProfileKey) {
+    try {
+      return Base64.decode(encodedProfileKey);
+    } catch (IOException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  public static synchronized @NonNull byte[] rotateProfileKey(@NonNull Context context) {
+    TextSecurePreferences.setProfileKey(context, null);
+    return getProfileKey(context);
+  }
+
+  public static synchronized @NonNull String generateEncodedProfileKey(@NonNull Context context) {
+    return Util.getSecret(32);
+  }
+
+  public static synchronized void setEncodedProfileKey(@NonNull Context context, @Nullable String key) {
+    TextSecurePreferences.setProfileKey(context, key);
+  }
+}