Merge remote-tracking branch 'upstream/refactor-recipient' into refactor/avatar-cleanup

Author: jbsession

app/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt

@@ -176,7 +176,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
                 val threadID = if (shouldCreateThread(parsedParams)) {
                     threadDatabase.getOrCreateThreadIdFor(threadAddress)
                 } else {
-                    threadDatabase.getOrCreateThreadIdFor(threadAddress)
+                    threadDatabase.getThreadIdIfExistsFor(threadAddress)
                 }
                 threadMap.getOrPut(threadID) { mutableListOf() } += parsedParams
             } catch (e: Exception) {

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/configs/ConfigToDatabaseSync.kt

@@ -6,6 +6,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
@@ -28,6 +29,7 @@ import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.fromSerialized
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.UserConfigType
 import org.session.libsession.utilities.getGroup
 import org.session.libsession.utilities.userConfigsChanged
 import org.session.libsignal.crypto.ecc.DjbECPrivateKey
@@ -50,6 +52,8 @@ import org.thoughtcrime.securesms.dependencies.ManagerScope
 import org.thoughtcrime.securesms.dependencies.OnAppStartupComponent
 import org.thoughtcrime.securesms.repository.ConversationRepository
 import org.thoughtcrime.securesms.util.SessionMetaProtocol
+import org.thoughtcrime.securesms.util.castAwayType
+import java.util.EnumSet
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
@@ -87,9 +91,15 @@ class ConfigToDatabaseSync @Inject constructor(
             preferences.watchLocalNumber()
                 .filterNotNull()
                 .take(1)
-                .flatMapLatest { conversationRepository.conversationListAddressesFlow }
-                .map { addresses ->
-                    addresses to configFactory.withUserConfigs { it.convoInfoVolatile.all() }
+                .flatMapLatest {
+                    combine(
+                        conversationRepository.conversationListAddressesFlow,
+                        configFactory.userConfigsChanged(EnumSet.of(UserConfigType.CONVO_INFO_VOLATILE))
+                            .castAwayType()
+                            .onStart { emit(Unit) }
+                            .map { _ -> configFactory.withUserConfigs { it.convoInfoVolatile.all() } },
+                        ::Pair
+                    )
                 }
                 .distinctUntilChanged()
                 .collectLatest { (conversations, convoInfo) ->
@@ -104,9 +114,7 @@ class ConfigToDatabaseSync @Inject constructor(
     }
 
     private fun ensureConversations(addresses: Set<Address.Conversable>) {
-        val myAddress = Address.Standard(AccountId(preferences.getLocalNumber()!!))
-        val ensureAddresses = if (myAddress in addresses) addresses else addresses + myAddress
-        val result = threadDatabase.ensureThreads(ensureAddresses) // Always include NTS so it doesn't get deleted
+        val result = threadDatabase.ensureThreads(addresses)
 
         if (result.deletedThreads.isNotEmpty()) {
             val deletedThreadIDs = result.deletedThreads.values

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/groups/GroupLeavingWorker.kt

@@ -12,6 +12,7 @@ import androidx.work.WorkerParameters
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.channels.Channel
 import org.session.libsession.messaging.groups.GroupScope
 import org.session.libsession.messaging.messages.control.GroupUpdated
 import org.session.libsession.messaging.sending_receiving.MessageSender
@@ -73,14 +74,19 @@ class GroupLeavingWorker @AssistedInject constructor(
                         )
 
                         // If we are not the only admin, send a left message for other admin to handle the member removal
+                        // We'll have to wait for this message to be sent before going ahead to delete the group
+                        val statusChannel = Channel<kotlin.Result<Unit>>()
                         MessageSender.send(
                             GroupUpdated(
                                 GroupUpdateMessage.newBuilder()
                                     .setMemberLeftMessage(DataMessage.GroupUpdateMemberLeftMessage.getDefaultInstance())
                                     .build()
                             ),
                             address,
+                            statusCallback = statusChannel
                         )
+
+                        statusChannel.receive().getOrThrow()
                     }
 
                     // If we are the only admin, leaving this group will destroy the group

app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt

@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
+import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
 import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.groups.GroupManagerV2
 import org.session.libsession.utilities.Address
@@ -93,7 +94,11 @@ class HomeViewModel @Inject constructor(
                 conversationRepository.observeConversationList()
             }
             .map { convos ->
-                val (approved, unapproved) = convos.partition { it.recipient.approved }
+                val (approved, unapproved) = convos
+                    .asSequence()
+                    .filter { !it.recipient.blocked } // We don't display blocked convo
+                    .filter { it.recipient.priority != PRIORITY_HIDDEN } // We don't show hidden convo
+                    .partition { it.recipient.approved }
                 val unreadUnapproved = unapproved
                     .count { it.unreadCount > 0 || it.unreadMentionCount > 0 }
                 unreadUnapproved to approved.sortedWith(CONVERSATION_COMPARATOR)

app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt

@@ -165,12 +165,10 @@ class DefaultConversationRepository @Inject constructor(
     private fun getConversationListAddresses() = buildSet {
         val myAddress = Address.Standard(AccountId(textSecurePreferences.getLocalNumber() ?: return@buildSet ))
 
-        configFactory.withUserConfigs { configs ->
-            // Have NTS?
-            if (configs.userProfile.getNtsPriority() >= 0) {
-                add(myAddress)
-            }
+        // Always have NTS - we should only "hide" them on home screen - the convo should never be deleted
+        add(myAddress)
 
+        configFactory.withUserConfigs { configs ->
             // Contacts
             for (contact in configs.contacts.all()) {
                 if (contact.priority >= 0 && (!contact.blocked || contact.approved)) {