Merge pull request #994 from ceokot/message-request-response

Add profile data to message request responses

libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

@@ -12,6 +12,7 @@ import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.control.ConfigurationMessage
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
 import org.session.libsession.messaging.messages.visible.Attachment
+import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsession.messaging.messages.visible.Reaction
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.GroupMember
@@ -35,9 +36,7 @@ interface StorageProtocol {
     // General
     fun getUserPublicKey(): String?
     fun getUserX25519KeyPair(): ECKeyPair
-    fun getUserDisplayName(): String?
-    fun getUserProfileKey(): ByteArray?
-    fun getUserProfilePictureURL(): String?
+    fun getUserProfile(): Profile
     fun setUserProfilePictureURL(newProfilePicture: String)
     // Signal
     fun getOrGenerateRegistrationID(): Int

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

@@ -1,15 +1,22 @@
 package org.session.libsession.messaging.messages.control
 
+import com.google.protobuf.ByteString
+import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsignal.protos.SignalServiceProtos
 import org.session.libsignal.utilities.Log
 
-class MessageRequestResponse(val isApproved: Boolean) : ControlMessage() {
+class MessageRequestResponse(val isApproved: Boolean, var profile: Profile? = null) : ControlMessage() {
 
     override val isSelfSendValid: Boolean = true
 
     override fun toProto(): SignalServiceProtos.Content? {
+        val profileProto = SignalServiceProtos.DataMessage.LokiProfile.newBuilder()
+        profile?.displayName?.let { profileProto.displayName = it }
+        profile?.profilePictureURL?.let { profileProto.profilePicture = it }
         val messageRequestResponseProto = SignalServiceProtos.MessageRequestResponse.newBuilder()
             .setIsApproved(isApproved)
+            .setProfile(profileProto.build())
+        profile?.profileKey?.let { messageRequestResponseProto.profileKey = ByteString.copyFrom(it) }
         return try {
             SignalServiceProtos.Content.newBuilder()
                 .setMessageRequestResponse(messageRequestResponseProto.build())
@@ -26,7 +33,13 @@ class MessageRequestResponse(val isApproved: Boolean) : ControlMessage() {
         fun fromProto(proto: SignalServiceProtos.Content): MessageRequestResponse? {
             val messageRequestResponseProto = if (proto.hasMessageRequestResponse()) proto.messageRequestResponse else return null
             val isApproved = messageRequestResponseProto.isApproved
-            return MessageRequestResponse(isApproved)
+            val profileProto = messageRequestResponseProto.profile
+            val profile = Profile().apply {
+                displayName = profileProto.displayName
+                profileKey = if (messageRequestResponseProto.hasProfileKey()) messageRequestResponseProto.profileKey.toByteArray() else null
+                profilePictureURL = profileProto.profilePicture
+            }
+            return MessageRequestResponse(isApproved, profile)
         }
     }
 

libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt

@@ -25,7 +25,7 @@ class Profile() {
         }
     }
 
-    internal constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
+    constructor(displayName: String, profileKey: ByteArray? = null, profilePictureURL: String? = null) : this() {
         this.displayName = displayName
         this.profileKey = profileKey
         this.profilePictureURL = profilePictureURL

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

@@ -8,9 +8,13 @@ import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.jobs.NotifyPNServerJob
 import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.Message
-import org.session.libsession.messaging.messages.control.*
+import org.session.libsession.messaging.messages.control.CallMessage
+import org.session.libsession.messaging.messages.control.ClosedGroupControlMessage
+import org.session.libsession.messaging.messages.control.ConfigurationMessage
+import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
+import org.session.libsession.messaging.messages.control.MessageRequestResponse
+import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.visible.LinkPreview
-import org.session.libsession.messaging.messages.visible.Profile
 import org.session.libsession.messaging.messages.visible.Quote
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupApi
@@ -109,14 +113,10 @@ object MessageSender {
             }
             // Attach the user's profile if needed
             if (message is VisibleMessage) {
-                val displayName = storage.getUserDisplayName()!!
-                val profileKey = storage.getUserProfileKey()
-                val profilePictureUrl = storage.getUserProfilePictureURL()
-                if (profileKey != null && profilePictureUrl != null) {
-                    message.profile = Profile(displayName, profileKey, profilePictureUrl)
-                } else {
-                    message.profile = Profile(displayName)
-                }
+                message.profile = storage.getUserProfile()
+            }
+            if (message is MessageRequestResponse) {
+                message.profile = storage.getUserProfile()
             }
             // Convert it to protobuf
             val proto = message.toProto() ?: throw Error.ProtoConversionFailed
@@ -248,14 +248,7 @@ object MessageSender {
         try {
             // Attach the user's profile if needed
             if (message is VisibleMessage) {
-                val displayName = storage.getUserDisplayName()!!
-                val profileKey = storage.getUserProfileKey()
-                val profilePictureUrl = storage.getUserProfilePictureURL()
-                if (profileKey != null && profilePictureUrl != null) {
-                    message.profile = Profile(displayName, profileKey, profilePictureUrl)
-                } else {
-                    message.profile = Profile(displayName)
-                }
+                message.profile = storage.getUserProfile()
             }
             when (destination) {
                 is Destination.OpenGroup -> {