Merge pull request #1691 from session-foundation/pro-message-integration

Pro message integration (Part I)

Author: SessionHero01

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

@@ -1,6 +1,5 @@
 package org.session.libsession.database
 
-import android.content.Context
 import android.net.Uri
 import network.loki.messenger.libsession_util.util.ExpiryMode
 import network.loki.messenger.libsession_util.util.KeyPair
@@ -26,7 +25,6 @@ import org.session.libsession.utilities.GroupRecord
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.messages.SignalServiceAttachmentPointer
-import org.session.libsignal.messages.SignalServiceGroup
 import org.session.libsignal.utilities.AccountId
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
@@ -117,8 +115,6 @@ interface StorageProtocol {
     fun addClosedGroupEncryptionKeyPair(encryptionKeyPair: ECKeyPair, groupPublicKey: String, timestamp: Long)
     fun removeAllClosedGroupEncryptionKeyPairs(groupPublicKey: String)
 
-    fun insertOutgoingInfoMessage(context: Context, groupID: String, type: SignalServiceGroup.Type, name: String,
-        members: Collection<String>, admins: Collection<String>, threadID: Long, sentTimestamp: Long): Long?
     fun isLegacyClosedGroup(publicKey: String): Boolean
     fun getClosedGroupEncryptionKeyPairs(groupPublicKey: String): MutableList<ECKeyPair>
     fun getLatestClosedGroupEncryptionKeyPair(groupPublicKey: String): ECKeyPair?

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

@@ -1,7 +1,6 @@
 package org.session.libsession.messaging.messages
 
 import network.loki.messenger.libsession_util.util.ExpiryMode
-import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.messages.control.ExpirationTimerUpdate
 import org.session.libsession.messaging.messages.visible.VisibleMessage

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

@@ -0,0 +1,62 @@
+package org.session.libsession.messaging.messages.signal
+
+import network.loki.messenger.libsession_util.protocol.ProFeatures
+import org.session.libsession.messaging.messages.visible.VisibleMessage
+import org.session.libsession.messaging.sending_receiving.attachments.Attachment
+import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
+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,
+    val hasMention: Boolean,
+    val body: String?,
+    val group: Address.GroupLike?,
+    val attachments: List<Attachment>,
+    val proFeatures: ProFeatures,
+    val messageContent: MessageContent?,
+    val quote: QuoteModel?,
+    val sharedContacts: List<Contact>,
+    val linkPreviews: List<LinkPreview>,
+    val dataExtractionNotification: DataExtractionNotificationInfoMessage?,
+) {
+
+    constructor(
+        message: VisibleMessage,
+        from: Address,
+        expiresIn: Long,
+        expireStartedAt: Long,
+        group: Address.GroupLike?,
+        attachments: List<Attachment>,
+        quote: QuoteModel?,
+        linkPreviews: List<LinkPreview>
+    ): this(
+        from = from,
+        sentTimeMillis = message.sentTimestamp!!,
+        subscriptionId = -1,
+        expiresIn = expiresIn,
+        expireStartedAt = expireStartedAt,
+        isMessageRequestResponse = false,
+        hasMention = message.hasMention,
+        body = message.text,
+        group = group,
+        attachments = attachments,
+        proFeatures = message.proFeatures,
+        messageContent = null,
+        quote = quote,
+        sharedContacts = emptyList(),
+        linkPreviews = linkPreviews,
+        dataExtractionNotification = null
+    )
+
+    val isMediaSavedDataExtraction: Boolean get() =
+        dataExtractionNotification?.kind == DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED
+}