Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Call stuck connecting state (WPB-15575) #3862

Merged
merged 4 commits into from
Feb 12, 2025
Merged

fix: Call stuck connecting state (WPB-15575) #3862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b08c163
fix: Call stuck on Connecting state after joining a call or putting t…
ohassine Feb 6, 2025
fcff204
chore: update kalium reference
ohassine Feb 6, 2025
f8725d8
chore: kalium
ohassine Feb 6, 2025
aa61815
Merge remote-tracking branch 'origin/develop' into call-stuck-connecting
MohamadJaara Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions app/src/main/kotlin/com/wire/android/di/accountScoped/CallsModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import com.wire.kalium.logic.feature.call.usecase.EndCallOnConversationChangeUse
import com.wire.kalium.logic.feature.call.usecase.EndCallUseCase
import com.wire.kalium.logic.feature.call.usecase.FlipToBackCameraUseCase
import com.wire.kalium.logic.feature.call.usecase.FlipToFrontCameraUseCase
import com.wire.kalium.logic.feature.call.usecase.GetAllCallsWithSortedParticipantsUseCase
import com.wire.kalium.logic.feature.call.usecase.GetIncomingCallsUseCase
import com.wire.kalium.logic.feature.call.usecase.MuteCallUseCase
import com.wire.kalium.logic.feature.call.usecase.ObserveEstablishedCallsUseCase
import com.wire.kalium.logic.feature.call.usecase.ObserveOutgoingCallUseCase
Expand Down Expand Up @@ -58,7 +58,7 @@ class CallsModule {

@ViewModelScoped
@Provides
fun provideGetIncomingCallsUseCase(callsScope: CallsScope) =
fun provideGetIncomingCallsUseCase(callsScope: CallsScope): GetIncomingCallsUseCase =
callsScope.getIncomingCalls

@ViewModelScoped
Expand Down Expand Up @@ -91,12 +91,6 @@ class CallsModule {
fun provideAcceptCallUseCase(callsScope: CallsScope) =
callsScope.answerCall

@ViewModelScoped
@Provides
fun provideObserveCallByConversationIdUseCase(
callsScope: CallsScope
): GetAllCallsWithSortedParticipantsUseCase = callsScope.allCallsWithSortedParticipants

@ViewModelScoped
@Provides
fun provideOnGoingCallUseCase(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/calling/SharedCallingViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ class SharedCallingViewModel @AssistedInject constructor(

init {
viewModelScope.launch {
val allCallsSharedFlow = observeEstablishedCallWithSortedParticipants(conversationId)
val allCallsSharedFlow = observeEstablishedCallWithSortedParticipants()
.flowOn(dispatchers.default()).shareIn(this, started = SharingStarted.Lazily)

launch {
Expand Down
6 changes: 3 additions & 3 deletions app/src/test/kotlin/com/wire/android/ui/calling/SharedCallingViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ import org.junit.jupiter.api.extension.ExtendWith
class SharedCallingViewModelTest {

@MockK
private lateinit var establishedCall: ObserveEstablishedCallWithSortedParticipantsUseCase
private lateinit var observeEstablishedCall: ObserveEstablishedCallWithSortedParticipantsUseCase

@MockK
private lateinit var endCall: EndCallUseCase
Expand Down Expand Up @@ -141,7 +141,7 @@ class SharedCallingViewModelTest {
@BeforeEach
fun setup() {
MockKAnnotations.init(this)
coEvery { establishedCall.invoke(any()) } returns callFlow
coEvery { observeEstablishedCall.invoke() } returns callFlow
coEvery { observeConversationDetails.invoke(any()) } returns emptyFlow()
coEvery { observeSpeaker.invoke() } returns emptyFlow()
coEvery { observeInCallReactionsUseCase(any()) } returns reactionsFlow
Expand All @@ -150,7 +150,7 @@ class SharedCallingViewModelTest {
sharedCallingViewModel = SharedCallingViewModel(
conversationId = conversationId,
conversationDetails = observeConversationDetails,
observeEstablishedCallWithSortedParticipants = establishedCall,
observeEstablishedCallWithSortedParticipants = observeEstablishedCall,
endCall = endCall,
muteCall = muteCall,
flipToFrontCamera = flipToFrontCamera,
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 8 files
+3 −3 cli/src/jvmMain/kotlin/com/wire/kalium/cli/commands/ConsoleCommand.kt
+0 −24 logic/src/commonMain/kotlin/com/wire/kalium/logic/data/call/CallRepository.kt
+5 −7 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/CallsScope.kt
+3 −6 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/AnswerCallUseCase.kt
+0 −50 ...rc/commonMain/kotlin/com/wire/kalium/logic/feature/call/usecase/GetAllCallsWithSortedParticipantsUseCase.kt
+9 −13 ...in/kotlin/com/wire/kalium/logic/feature/call/usecase/ObserveEstablishedCallWithSortedParticipantsUseCase.kt
+14 −13 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/AnswerCallUseCaseTest.kt
+15 −37 ...otlin/com/wire/kalium/logic/feature/call/usecase/ObserveEstablishedCallWithSortedParticipantsUseCaseTest.kt
Loading