[SES-3743] - Fix message request approval message not showing

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

@@ -1910,7 +1910,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
     private fun sendTextOnlyMessage(hasPermissionToSendSeed: Boolean = false): Pair<Address, Long>? {
         val recipient = viewModel.recipient ?: return null
         val sentTimestamp = SnodeAPI.nowWithOffset
-        viewModel.beforeSendingTextOnlyMessage()
+        viewModel.implicitlyApproveRecipient()
         val text = getMessageBody()
         val userPublicKey = textSecurePreferences.getLocalNumber()
         val isNoteToSelf = (recipient.isContactRecipient && recipient.address.toString() == userPublicKey)
@@ -1949,6 +1949,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 null,
                 true
             )
+
             MessageSender.send(message, recipient.address)
         }
         // Send a typing stopped message
@@ -1968,7 +1969,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
         }
         val recipient = viewModel.recipient!!
         val sentTimestamp = SnodeAPI.nowWithOffset
-        viewModel.beforeSendingAttachments()
+        viewModel.implicitlyApproveRecipient()
 
         // Create the message
         val message = VisibleMessage().applyExpiryMode(viewModel.threadId)
@@ -2014,6 +2015,7 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
                 null,
                 runThreadUpdate = true
             )
+
             MessageSender.send(message, recipient.address, attachments, quote, linkPreview)
         }
 

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

@@ -15,6 +15,7 @@ import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.consumeEach
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -971,18 +972,10 @@ class ConversationViewModel(
         attachmentDownloadHandler.retryFailedAttachments(attachments)
     }
 
-    fun beforeSendingTextOnlyMessage() {
-        implicitlyApproveRecipient()
-    }
-
-    fun beforeSendingAttachments() {
-        implicitlyApproveRecipient()
-    }
-
-    private fun implicitlyApproveRecipient() {
-        val recipient = recipient
+   fun implicitlyApproveRecipient() {
+       val recipient = recipient
 
-        if (uiState.value.messageRequestState is MessageRequestUiState.Visible) {
+       if (uiState.value.messageRequestState is MessageRequestUiState.Visible) {
             acceptMessageRequest()
         } else if (recipient?.isApproved == false) {
             // edge case for new outgoing thread on new recipient without sending approval messages

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

@@ -416,11 +416,8 @@ class DefaultConversationRepository @Inject constructor(
                 )
             } else {
                 val message = MessageRequestResponse(true)
-                MessageSender.sendNonDurably(
-                    message = message,
-                    destination = Destination.from(recipient.address),
-                    isSyncMessage = recipient.isLocalNumber
-                ).await()
+
+                MessageSender.send(message = message, address = recipient.address)
 
                 // add a control message for our user
                 storage.insertMessageRequestResponseFromYou(threadId)