From b6e6b68554c52757bf26f5eeb39e4e521633a1d4 Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Mon, 17 Mar 2025 11:06:09 +1030 Subject: [PATCH] Fix/qa fixes (#1024) * SES-3512 - Different strings for call baner based on state * SES-3513 - Missed calls case on remote hangup * updated readme for BrowserStack --- README.md | 5 +++++ .../conversation/v2/ConversationActivityV2.kt | 11 +++++++---- .../conversation/v2/ConversationViewModel.kt | 14 ++++++++++---- .../thoughtcrime/securesms/home/HomeActivity.kt | 11 +++++++---- .../thoughtcrime/securesms/home/HomeViewModel.kt | 16 +++++++++++++--- .../securesms/webrtc/WebRtcCallBridge.kt | 2 +- 6 files changed, 43 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e52ae35eb3..f809195358 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,11 @@ sha256sum session-$SESSION_VERSION-universal.apk grep universal.apk signature.asc ``` +## Testing +### BrowserStack + +This project is tested with BrowserStack. + ## License Copyright 2011 Whisper Systems diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 59a8b0e53a..b73b7ba6dd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -1030,10 +1030,13 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate, lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { - viewModel.callInProgress.collect { callInProgress -> - when (callInProgress) { - true -> binding.conversationHeader.callInProgress.fadeIn() - false -> binding.conversationHeader.callInProgress.fadeOut() + viewModel.callBanner.collect { callBanner -> + when (callBanner) { + null -> binding.conversationHeader.callInProgress.fadeOut() + else -> { + binding.conversationHeader.callInProgress.text = callBanner + binding.conversationHeader.callInProgress.fadeIn() + } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt index b2211450b8..49dd3a613d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt @@ -77,6 +77,7 @@ import java.util.UUID class ConversationViewModel( val threadId: Long, val edKeyPair: KeyPair?, + private val context: Context, private val application: Application, private val repository: ConversationRepository, private val storage: StorageProtocol, @@ -267,10 +268,14 @@ class ConversationViewModel( scope = viewModelScope, ) - val callInProgress: StateFlow = callManager.currentConnectionStateFlow.map { + val callBanner: StateFlow = callManager.currentConnectionStateFlow.map { // a call is in progress if it isn't idle nor disconnected and the recipient is the person on the call - it !is State.Idle && it !is State.Disconnected && callManager.recipient?.address == recipient?.address - }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false) + if(it !is State.Idle && it !is State.Disconnected && callManager.recipient?.address == recipient?.address){ + // call is started, we need to differentiate between in progress vs incoming + if(it is State.Connected) context.getString(R.string.callsInProgress) + else context.getString(R.string.callsIncomingUnknown) + } else null // null when the call isn't in progress / incoming + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null) init { viewModelScope.launch(Dispatchers.Default) { @@ -1114,11 +1119,12 @@ class ConversationViewModel( private val callManager: CallManager, private val legacyGroupDeprecationManager: LegacyGroupDeprecationManager, private val expiredGroupManager: ExpiredGroupManager, - private val usernameUtils: UsernameUtils + private val usernameUtils: UsernameUtils, ) : ViewModelProvider.Factory { override fun create(modelClass: Class): T { return ConversationViewModel( + context = context, threadId = threadId, edKeyPair = edKeyPair, application = application, diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index 27d79fb867..4d243bc325 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -297,10 +297,13 @@ class HomeActivity : ScreenLockActionBarActivity(), lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { - homeViewModel.callInProgress.collect { callInProgress -> - when (callInProgress) { - true -> binding.callInProgress.fadeIn() - false -> binding.callInProgress.fadeOut() + homeViewModel.callBanner.collect { callBanner -> + when (callBanner) { + null -> binding.callInProgress.fadeOut() + else -> { + binding.callInProgress.text = callBanner + binding.callInProgress.fadeIn() + } } } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt index b71fa0e954..c891813d79 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt @@ -1,11 +1,13 @@ package org.thoughtcrime.securesms.home import android.content.ContentResolver +import android.content.Context import androidx.annotation.AttrRes import androidx.lifecycle.ViewModel import androidx.lifecycle.asFlow import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel +import dagger.hilt.android.qualifiers.ApplicationContext import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.channels.BufferOverflow @@ -24,6 +26,7 @@ import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.stateIn +import network.loki.messenger.R import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN import org.session.libsession.utilities.ConfigUpdateNotification import org.session.libsession.utilities.TextSecurePreferences @@ -40,6 +43,8 @@ import javax.inject.Inject @HiltViewModel class HomeViewModel @Inject constructor( + @ApplicationContext + private val context: Context, private val threadDb: ThreadDatabase, private val contentResolver: ContentResolver, private val prefs: TextSecurePreferences, @@ -54,9 +59,14 @@ class HomeViewModel @Inject constructor( onBufferOverflow = BufferOverflow.DROP_OLDEST ) - val callInProgress: StateFlow = callManager.currentConnectionStateFlow.map { - it !is State.Idle && it !is State.Disconnected // a call is in progress if it isn't idle nor disconnected - }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), initialValue = false) + val callBanner: StateFlow = callManager.currentConnectionStateFlow.map { + // a call is in progress if it isn't idle nor disconnected + if(it !is State.Idle && it !is State.Disconnected){ + // call is started, we need to differentiate between in progress vs incoming + if(it is State.Connected) context.getString(R.string.callsInProgress) + else context.getString(R.string.callsIncomingUnknown) + } else null // null when the call isn't in progress / incoming + }.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), initialValue = null) /** * A [StateFlow] that emits the list of threads and the typing status of each thread. diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcCallBridge.kt b/app/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcCallBridge.kt index 255cda2cdd..8fe10bcbaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcCallBridge.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/WebRtcCallBridge.kt @@ -133,7 +133,7 @@ class WebRtcCallBridge @Inject constructor( serviceExecutor.execute { callManager.handleRemoteHangup() - if (callManager.currentConnectionState in CallState.CAN_DECLINE_STATES) { + if (!hasAcceptedCall.value) { callManager.recipient?.let { recipient -> insertMissedCall(recipient, true) }