Integrate ProFeatures into messages Part III

app/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.kt

@@ -7,13 +7,11 @@ import org.session.libsession.messaging.sending_receiving.data_extraction.DataEx
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.Contact
 import org.thoughtcrime.securesms.database.model.content.MessageContent
 
 class IncomingMediaMessage(
     val from: Address,
     val sentTimeMillis: Long,
-    val subscriptionId: Int,
     val expiresIn: Long,
     val expireStartedAt: Long,
     val isMessageRequestResponse: Boolean,
@@ -24,7 +22,6 @@ class IncomingMediaMessage(
     val proFeatures: ProFeatures,
     val messageContent: MessageContent?,
     val quote: QuoteModel?,
-    val sharedContacts: List<Contact>,
     val linkPreviews: List<LinkPreview>,
     val dataExtractionNotification: DataExtractionNotificationInfoMessage?,
 ) {
@@ -41,7 +38,6 @@ class IncomingMediaMessage(
     ): this(
         from = from,
         sentTimeMillis = message.sentTimestamp!!,
-        subscriptionId = -1,
         expiresIn = expiresIn,
         expireStartedAt = expireStartedAt,
         isMessageRequestResponse = false,
@@ -52,7 +48,6 @@ class IncomingMediaMessage(
         proFeatures = message.proFeatures,
         messageContent = null,
         quote = quote,
-        sharedContacts = emptyList(),
         linkPreviews = linkPreviews,
         dataExtractionNotification = null
     )

app/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.kt

@@ -11,13 +11,11 @@ import java.util.EnumSet
 data class IncomingTextMessage(
     val message: String?,
     val sender: Address,
-    val senderDeviceId: Int,
     val sentTimestampMillis: Long,
     val group: Address.GroupLike?,
     val push: Boolean,
     val expiresInMillis: Long,
     val expireStartedAt: Long,
-    val unidentified: Boolean,
     val callType: Int,
     val hasMention: Boolean,
     val isOpenGroupInvitation: Boolean,
@@ -26,21 +24,6 @@ data class IncomingTextMessage(
     val isGroupMessage: Boolean = false,
     val isGroupUpdateMessage: Boolean = false,
 ) {
-    // Legacy code
-    val protocol: Int get() = 31337
-
-    // Legacy code
-    val serviceCenterAddress: String get() = "GCM"
-
-    // Legacy code
-    val replyPathPresent: Boolean get() = true
-
-    // Legacy code
-    val pseudoSubject: String get() = ""
-
-    // Legacy code
-    val subscriptionId: Int get() = -1
-
     val callMessageType: CallMessageType? get() =
         CallMessageType.entries.getOrNull(callType)
 
@@ -65,17 +48,15 @@ data class IncomingTextMessage(
         expiresInMillis: Long,
         expireStartedAt: Long,
     ): this(
+        message = message.text,
         sender = sender,
-        senderDeviceId = 1,
         sentTimestampMillis = message.sentTimestamp!!,
-        message = message.text,
         group = group,
+        push = true,
         expiresInMillis = expiresInMillis,
         expireStartedAt = expireStartedAt,
-        unidentified = false,
-        hasMention = message.hasMention,
-        push = true,
         callType = -1,
+        hasMention = message.hasMention,
         isOpenGroupInvitation = false,
         isSecureMessage = false,
         proFeatures = message.proFeatures,
@@ -90,13 +71,11 @@ data class IncomingTextMessage(
     ): this(
         message = null,
         sender = sender,
-        senderDeviceId = 1,
         sentTimestampMillis = sentTimestampMillis,
         group = group,
         push = false,
         expiresInMillis = expiresInMillis,
         expireStartedAt = expireStartedAt,
-        unidentified = false,
         callType = callMessageType.ordinal,
         hasMention = false,
         isOpenGroupInvitation = false,
@@ -120,13 +99,11 @@ data class IncomingTextMessage(
             return IncomingTextMessage(
                 message = body,
                 sender = sender,
-                senderDeviceId = 1,
                 sentTimestampMillis = sentTimestampMillis,
                 group = null,
                 push = true,
                 expiresInMillis = expiresInMillis,
                 expireStartedAt = expireStartedAt,
-                unidentified = false,
                 callType = -1,
                 hasMention = false,
                 isOpenGroupInvitation = true,

app/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.kt

@@ -6,26 +6,17 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
 import org.session.libsession.utilities.Address
-import org.session.libsession.utilities.Contact
-import org.session.libsession.utilities.DistributionTypes
-import org.session.libsession.utilities.IdentityKeyMismatch
-import org.session.libsession.utilities.NetworkFailure
 import org.thoughtcrime.securesms.database.model.content.MessageContent
 
 class OutgoingMediaMessage(
     val recipient: Address,
     val body: String?,
     val attachments: List<Attachment>,
     val sentTimeMillis: Long,
-    val distributionType: Int,
-    val subscriptionId: Int,
     val expiresInMillis: Long,
     val expireStartedAtMillis: Long,
     val outgoingQuote: QuoteModel?,
     val messageContent: MessageContent?,
-    val networkFailures: List<NetworkFailure>,
-    val identityKeyMismatches: List<IdentityKeyMismatch>,
-    val contacts: List<Contact>,
     val linkPreviews: List<LinkPreview>,
     val group: Address.GroupLike?,
     val isGroupUpdateMessage: Boolean,
@@ -50,16 +41,11 @@ class OutgoingMediaMessage(
         body = message.text,
         attachments = attachments,
         sentTimeMillis = message.sentTimestamp!!,
-        subscriptionId = -1,
         expiresInMillis = expiresInMillis,
         expireStartedAtMillis = expireStartedAt,
-        distributionType = DistributionTypes.DEFAULT,
         outgoingQuote = outgoingQuote,
-        contacts = emptyList(),
         messageContent = null,
         linkPreviews = linkPreview?.let { listOf(it) } ?: emptyList(),
-        networkFailures = emptyList(),
-        identityKeyMismatches = emptyList(),
         group = null,
         isGroupUpdateMessage = false,
     )
@@ -74,23 +60,17 @@ class OutgoingMediaMessage(
         expireStartedAtMillis: Long,
         isGroupUpdateMessage: Boolean,
         quote: QuoteModel?,
-        contacts: List<Contact>,
         previews: List<LinkPreview>,
         messageContent: MessageContent?,
     ) : this(
         recipient = recipient,
         body = body,
         attachments = avatar?.let { listOf(it) } ?: emptyList(),
         sentTimeMillis = sentTimeMillis,
-        distributionType = DistributionTypes.CONVERSATION,
-        subscriptionId = -1,
         expiresInMillis = expiresInMillis,
         expireStartedAtMillis = expireStartedAtMillis,
         outgoingQuote = quote,
         messageContent = messageContent,
-        networkFailures = emptyList(),
-        identityKeyMismatches = emptyList(),
-        contacts = contacts,
         linkPreviews = previews,
         group = group,
         isGroupUpdateMessage = isGroupUpdateMessage,

app/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingTextMessage.kt

@@ -11,7 +11,6 @@ data class OutgoingTextMessage(
     val message: String?,
     val expiresInMillis: Long,
     val expireStartedAtMillis: Long,
-    val subscriptionId: Int = -1,
     val sentTimestampMillis: Long,
     val isOpenGroupInvitation: Boolean,
     val proFeatures: ProFeatures = ProFeatures.NONE,

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageRequestResponseHandler.kt

@@ -154,7 +154,6 @@ class MessageRequestResponseHandler @Inject constructor(
                         retrieved = IncomingMediaMessage(
                             from = messageSender.address,
                             sentTimeMillis = messageTimestampMs,
-                            subscriptionId = -1,
                             expiresIn = 0L,
                             expireStartedAt = 0L,
                             isMessageRequestResponse = true,
@@ -165,7 +164,6 @@ class MessageRequestResponseHandler @Inject constructor(
                             proFeatures = ProFeatures.NONE,
                             messageContent = null,
                             quote = null,
-                            sharedContacts = emptyList(),
                             linkPreviews = emptyList(),
                             dataExtractionNotification = null
                         ),