Renamed acceptsCommunityMessageRequests

Author: SessionHero01

app/src/main/java/org/session/libsession/utilities/recipients/Recipient.kt

@@ -13,7 +13,6 @@ import org.session.libsession.utilities.isLegacyGroup
 import org.session.libsession.utilities.isStandard
 import org.thoughtcrime.securesms.database.model.NotifyType
 import java.time.Instant
-import java.time.ZonedDateTime
 
 data class Recipient(
     val address: Address,
@@ -113,10 +112,10 @@ data class Recipient(
     val mutedUntilMills: Long?
         get() = mutedUntil?.toEpochMilli()
 
-    val acceptsCommunityMessageRequests: Boolean
+    val acceptsBlindedCommunityMessageRequests: Boolean
         get() = when (data) {
-            is RecipientData.BlindedContact -> data.acceptsCommunityMessageRequests
-            is RecipientData.Generic -> data.acceptsCommunityMessageRequests
+            is RecipientData.BlindedContact -> data.acceptsBlindedCommunityMessageRequests
+            is RecipientData.Generic -> data.acceptsBlindedCommunityMessageRequests
             is RecipientData.Community,
             is RecipientData.LegacyGroup,
             is RecipientData.Contact,

app/src/main/java/org/session/libsession/utilities/recipients/RecipientData.kt

@@ -9,7 +9,6 @@ import org.session.libsession.messaging.open_groups.OpenGroup
 import org.session.libsession.utilities.Address
 import org.session.libsignal.utilities.AccountId
 import java.time.Instant
-import java.time.ZonedDateTime
 
 /**
  * Represents different kind of data associated with different types of recipients.
@@ -50,7 +49,7 @@ sealed interface RecipientData {
         override val avatar: RemoteFile? = null,
         override val priority: Long = PRIORITY_VISIBLE,
         override val proStatus: ProStatus = ProStatus.None,
-        val acceptsCommunityMessageRequests: Boolean = false,
+        val acceptsBlindedCommunityMessageRequests: Boolean = false,
         override val profileUpdatedAt: Instant? = null,
     ) : RecipientData
 
@@ -59,7 +58,7 @@ sealed interface RecipientData {
         override val avatar: RemoteFile.Encrypted?,
         override val priority: Long,
         override val proStatus: ProStatus,
-        val acceptsCommunityMessageRequests: Boolean,
+        val acceptsBlindedCommunityMessageRequests: Boolean,
         override val profileUpdatedAt: Instant?
     ) : ConfigBased, RecipientData
 

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

@@ -76,7 +76,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.receiveAsFlow
-import kotlinx.coroutines.flow.scan
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import network.loki.messenger.R
@@ -1425,7 +1424,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
             }
 
             // If we're trying to message someone who has blocked community message requests
-            recipient.address.isBlinded && !recipient.acceptsCommunityMessageRequests -> {
+            recipient.address.isBlinded && !recipient.acceptsBlindedCommunityMessageRequests -> {
                 Phrase.from(applicationContext, R.string.messageRequestsTurnedOff)
                     .put(NAME_KEY, recipient.displayName())
                     .format()

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

@@ -208,7 +208,7 @@ class ConversationViewModel @AssistedInject constructor(
 
 
     val showSendAfterApprovalText: Flow<Boolean> get() = recipientFlow.map { r ->
-        (r.acceptsCommunityMessageRequests || r.isStandardRecipient) && !r.isLocalNumber && !r.approvedMe
+        (r.acceptsBlindedCommunityMessageRequests || r.isStandardRecipient) && !r.isLocalNumber && !r.approvedMe
     }
 
     val openGroupFlow: StateFlow<OpenGroup?> = recipientFlow
@@ -616,7 +616,7 @@ class ConversationViewModel @AssistedInject constructor(
                 groupDb.getGroup(recipient.address.toGroupString()).orNull()?.isActive == true &&
                         deprecationState != LegacyGroupDeprecationManager.DeprecationState.DEPRECATED
             }
-            address.isCommunityInbox && !recipient.acceptsCommunityMessageRequests -> false
+            address.isCommunityInbox && !recipient.acceptsBlindedCommunityMessageRequests -> false
             else -> true
         }
     }

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

@@ -461,7 +461,7 @@ class RecipientRepository @Inject constructor(
                     // This information is not available in the config but we infer that
                     // if you already have this person as blinded contact, you would have been
                     // able to send them a message before.
-                    acceptsCommunityMessageRequests = true,
+                    acceptsBlindedCommunityMessageRequests = true,
                     profileUpdatedAt = contact.profileUpdatedEpochSeconds.secondsToInstant()
                 )
             }
@@ -491,7 +491,7 @@ class RecipientRepository @Inject constructor(
                 displayName = settings.name?.takeIf { it.isNotBlank() } ?: groupMemberInfo?.name.orEmpty(),
                 avatar = settings.profilePic?.toRemoteFile() ?: groupMemberInfo?.profilePic?.toRemoteFile(),
                 proStatus = settings.proStatus,
-                acceptsCommunityMessageRequests = !settings.blocksCommunityMessagesRequests,
+                acceptsBlindedCommunityMessageRequests = !settings.blocksCommunityMessagesRequests,
             ),
             mutedUntil = settings.muteUntil,
             autoDownloadAttachments = settings.autoDownloadAttachments,

app/src/main/java/org/thoughtcrime/securesms/util/UserProfileUtils.kt

@@ -120,7 +120,7 @@ class UserProfileUtils @AssistedInject constructor(
             threadAddress = threadAddress,
             isBlinded = recipient.address.isBlinded,
             tooltipText = tooltipText,
-            enableMessage = !recipient.address.isBlinded || recipient.acceptsCommunityMessageRequests,
+            enableMessage = !recipient.address.isBlinded || recipient.acceptsBlindedCommunityMessageRequests,
             expandedAvatar = false,
             showQR = false,
             showProCTA = false,