Merge pull request #1737 from session-foundation/feature/message-pro-feature-set

Message Pro Features

Author: ThomasSession

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

@@ -6,14 +6,14 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.utilities.UpdateMessageData
 import org.session.libsession.utilities.Address
 
-data class OutgoingTextMessage(
+data class OutgoingTextMessage private constructor(
     val recipient: Address,
     val message: String?,
     val expiresInMillis: Long,
     val expireStartedAtMillis: Long,
     val sentTimestampMillis: Long,
     val isOpenGroupInvitation: Boolean,
-    val proFeatures: Set<ProFeature> = emptySet()
+    val proFeatures: Set<ProFeature>
 ) {
     constructor(
         message: VisibleMessage,
@@ -27,6 +27,7 @@ data class OutgoingTextMessage(
         expireStartedAtMillis = expireStartedAtMillis,
         sentTimestampMillis = message.sentTimestamp!!,
         isOpenGroupInvitation = false,
+        proFeatures = message.proFeatures
     )
 
     companion object {
@@ -36,7 +37,8 @@ data class OutgoingTextMessage(
             sentTimestampMillis: Long,
             expiresInMillis: Long,
             expireStartedAtMillis: Long,
-        ): OutgoingTextMessage? {
+            proFeatures: Set<ProFeature>,
+            ): OutgoingTextMessage? {
             return OutgoingTextMessage(
                 recipient = recipient,
                 message = UpdateMessageData.buildOpenGroupInvitation(
@@ -47,6 +49,7 @@ data class OutgoingTextMessage(
                 expireStartedAtMillis = expireStartedAtMillis,
                 sentTimestampMillis = sentTimestampMillis,
                 isOpenGroupInvitation = true,
+                proFeatures = proFeatures
             )
         }
     }

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

@@ -30,6 +30,18 @@ data class VisibleMessage(
     var reaction: Reaction? = null,
     var hasMention: Boolean = false,
     var blocksMessageRequests: Boolean = false,
+    /**
+     * The pro features enabled for this message.
+     *
+     * Note:
+     * * When this message is an incoming message, the pro features will only be populated
+     * if we can prove that the sender has an active pro subscription.
+     *
+     * * When this message represents an outgoing message, this property can be populated by
+     * application code at their wishes but the actual translating to protobuf onto the wired will
+     * be checked against the current user's pro proof, if no active pro subscription is found,
+     * the pro features will not be sent in the protobuf messages.
+     */
     var proFeatures: Set<ProFeature> = emptySet()
 ) : Message()  {
 

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

@@ -124,8 +124,12 @@ class MessageSender @Inject constructor(
             msg.toProto(builder, messageDataProvider)
 
             // Attach pro proof
-            configFactory.withUserConfigs { it.userProfile.getProConfig() }?.proProof?.let { proof ->
-                builder.proMessageBuilder.proofBuilder.copyFromLibSession(proof)
+            val proProof = configFactory.withUserConfigs { it.userProfile.getProConfig() }?.proProof
+            if (proProof != null && proProof.expiryMs > snodeClock.currentTimeMills()) {
+                builder.proMessageBuilder.proofBuilder.copyFromLibSession(proProof)
+            } else {
+                // If we don't have any valid pro proof, clear the pro message
+                builder.clearProMessage()
             }
 
             // Attach the user's profile if needed

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

@@ -190,6 +190,7 @@ import org.thoughtcrime.securesms.mms.SlideDeck
 import org.thoughtcrime.securesms.mms.VideoSlide
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.preferences.PrivacySettingsActivity
+import org.thoughtcrime.securesms.pro.ProStatusManager
 import org.thoughtcrime.securesms.reactions.ReactionsDialogFragment
 import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiDialogFragment
 import org.thoughtcrime.securesms.showSessionDialog
@@ -263,6 +264,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
     @Inject lateinit var messageSender: MessageSender
     @Inject lateinit var resendMessageUtilities: ResendMessageUtilities
     @Inject lateinit var messageNotifier: MessageNotifier
+    @Inject lateinit var proStatusManager: ProStatusManager
     @Inject @ManagerScope
     lateinit var scope: CoroutineScope
 
@@ -2144,6 +2146,8 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         val message = VisibleMessage().applyExpiryMode(viewModel.address)
         message.sentTimestamp = sentTimestamp
         message.text = text
+        // pro features
+        proStatusManager.addProFeatures(message)
         val expiresInMillis = viewModel.recipient.expiryMode.expiryMillis
         val outgoingTextMessage = OutgoingTextMessage(
             message = message,
@@ -2206,6 +2210,8 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         val expireStartedAtMs = if (viewModel.recipient.expiryMode is ExpiryMode.AfterSend) {
             sentTimestamp
         } else 0
+        // pro features
+        proStatusManager.addProFeatures(message)
         val outgoingTextMessage = OutgoingMediaMessage(
             message = message,
             recipient = recipient.address,

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/ResendMessageUtilities.kt

@@ -35,6 +35,7 @@ class ResendMessageUtilities @Inject constructor(
             message.openGroupInvitation = openGroupInvitation
         } else {
             message.text = messageRecord.body
+            message.proFeatures = messageRecord.proFeatures
         }
         message.sentTimestamp = messageRecord.timestamp
         if (recipient.isGroupOrCommunity) {

app/src/main/java/org/thoughtcrime/securesms/database/RecipientRepository.kt

@@ -430,15 +430,13 @@ class RecipientRepository @Inject constructor(
 
         // Calculate the ProData for this recipient
         val proDataList = proDataContext?.proDataList
-        var proData = if (!proDataList.isNullOrEmpty()) {
-            proDataList.removeAll {
-                it.isExpired(now) || proDatabase.isRevoked(it.genIndexHash)
-            }
 
-            // The pro data that goes into the recipient, should show the one with the most information
-            proDataList.firstOrNull { it.showProBadge }?.let {
-                RecipientData.ProData(it.showProBadge)
-            }
+        proDataList?.removeAll {
+            it.isExpired(now) || proDatabase.isRevoked(it.genIndexHash)
+        }
+
+        var proData = if (!proDataList.isNullOrEmpty()) {
+            RecipientData.ProData(showProBadge = proDataList.any { it.showProBadge })
         } else {
             null
         }
@@ -583,7 +581,17 @@ class RecipientRepository @Inject constructor(
                     configFactory.withUserConfigs { configs ->
                         val pro = configs.userProfile.getProConfig()
 
-                        if (pro != null) {
+                        if (prefs.forceCurrentUserAsPro()) {
+                            proDataContext?.addProData(
+                                RecipientSettings.ProData(
+                                    showProBadge = configs.userProfile.getProFeatures().contains(
+                                        ProProfileFeature.PRO_BADGE
+                                    ),
+                                    expiry = Instant.now().plusSeconds(3600),
+                                    genIndexHash = "a1b2c3d4",
+                                )
+                            )
+                        } else if (pro != null) {
                             proDataContext?.addProData(
                                 RecipientSettings.ProData(
                                     showProBadge = configs.userProfile.getProFeatures().contains(

app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

@@ -369,7 +369,8 @@ open class Storage @Inject constructor(
                     recipient = targetAddress,
                     sentTimestampMillis = message.sentTimestamp!!,
                     expiresInMillis = expiresInMillis,
-                    expireStartedAtMillis = expireStartedAt
+                    expireStartedAtMillis = expireStartedAt,
+                    proFeatures = message.proFeatures
                 )!!
                 else OutgoingTextMessage(
                     message = message,

app/src/main/java/org/thoughtcrime/securesms/groups/SelectContactsViewModel.kt

@@ -69,9 +69,9 @@ open class SelectContactsViewModel @AssistedInject constructor(
         ::filterContacts
     ).stateIn(viewModelScope, SharingStarted.Lazily, emptyList())
 
-    val hasContacts: StateFlow<Boolean> = contactsFlow
+    val hasContacts: StateFlow<Boolean?> = contactsFlow
             .map { it.isNotEmpty() }
-            .stateIn(viewModelScope, SharingStarted.Eagerly, false)
+            .stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
     // Output
     val currentSelected: Set<Address>

app/src/main/java/org/thoughtcrime/securesms/home/startconversation/group/CreateGroupScreen.kt

@@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.ui.SearchBar
 import org.thoughtcrime.securesms.ui.components.AccentOutlineButton
 import org.thoughtcrime.securesms.ui.components.BackAppBar
 import org.thoughtcrime.securesms.ui.components.SessionOutlinedTextField
+import org.thoughtcrime.securesms.ui.components.SmallCircularProgressIndicator
 import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 import org.thoughtcrime.securesms.ui.theme.LocalDimensions
@@ -86,6 +87,7 @@ fun CreateGroupScreen(
         onContactItemClicked = viewModel::onContactItemClicked,
         showLoading = viewModel.isLoading.collectAsState().value,
         items = viewModel.contacts.collectAsState().value,
+        hasContacts = viewModel.hasContacts.collectAsState().value,
         onCreateClicked = viewModel::onCreateClicked,
         onBack = onBack,
     )
@@ -103,6 +105,7 @@ fun CreateGroup(
     onContactItemClicked: (address: Address) -> Unit,
     showLoading: Boolean,
     items: List<ContactItem>,
+    hasContacts: Boolean?,
     onCreateClicked: () -> Unit,
     onBack: () -> Unit,
     modifier: Modifier = Modifier
@@ -160,7 +163,13 @@ fun CreateGroup(
                     .nestedScroll(rememberNestedScrollInteropConnection()),
                 fadingColor = LocalColors.current.backgroundSecondary
             ) { bottomContentPadding ->
-                if(items.isEmpty() && contactSearchQuery.isEmpty()){
+                if(hasContacts == null){
+                    SmallCircularProgressIndicator(
+                        modifier = Modifier.padding(top = LocalDimensions.current.spacing)
+                            .align(Alignment.TopCenter),
+                    )
+                }
+                else if(!hasContacts && contactSearchQuery.isEmpty()){
                     Text(
                         modifier = Modifier.fillMaxWidth()
                             .padding(top = LocalDimensions.current.xsSpacing),
@@ -245,6 +254,7 @@ private fun CreateGroupPreview(
             onContactItemClicked = {},
             showLoading = false,
             items = previewMembers,
+            hasContacts = true,
             onCreateClicked = {},
             onBack = {},
             modifier = Modifier.background(LocalColors.current.backgroundSecondary),
@@ -270,6 +280,7 @@ private fun CreateEmptyGroupPreview(
             onContactItemClicked = {},
             showLoading = false,
             items = previewMembers,
+            hasContacts = false,
             onCreateClicked = {},
             onBack = {},
             modifier = Modifier.background(LocalColors.current.backgroundSecondary),
@@ -294,6 +305,7 @@ private fun CreateEmptyGroupPreviewWithSearch(
             onContactItemClicked = {},
             showLoading = false,
             items = previewMembers,
+            hasContacts = true,
             onCreateClicked = {},
             onBack = {},
             modifier = Modifier.background(LocalColors.current.backgroundSecondary),

app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.kt

@@ -39,6 +39,7 @@ import org.thoughtcrime.securesms.database.RecipientRepository
 import org.thoughtcrime.securesms.database.SmsDatabase
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.mms.MmsException
+import org.thoughtcrime.securesms.pro.ProStatusManager
 import javax.inject.Inject
 
 /**
@@ -67,6 +68,9 @@ class AndroidAutoReplyReceiver : BroadcastReceiver() {
     @Inject
     lateinit var messageSender: MessageSender
 
+    @Inject
+    lateinit var proStatusManager: ProStatusManager
+
     @SuppressLint("StaticFieldLeak")
     override fun onReceive(context: Context, intent: Intent) {
         if (REPLY_ACTION != intent.getAction()) return
@@ -92,6 +96,7 @@ class AndroidAutoReplyReceiver : BroadcastReceiver() {
 
                     val message = VisibleMessage()
                     message.text = responseText.toString()
+                    proStatusManager.addProFeatures(message)
                     message.sentTimestamp = nowWithOffset
                     messageSender.send(message, address!!)
                     val expiryMode = recipientRepository.getRecipientSync(address).expiryMode