review: consistency use isAudioCall everywhere (instead of voiceOnly)
This commit is contained in:
parent
4406b50542
commit
bad6085fb2
12 changed files with 19 additions and 19 deletions
|
|
@ -16,7 +16,7 @@ interface CallWidgetSettingsProvider {
|
|||
widgetId: String = UUID.randomUUID().toString(),
|
||||
encrypted: Boolean,
|
||||
direct: Boolean,
|
||||
voiceOnly: Boolean,
|
||||
isAudioCall: Boolean,
|
||||
hasActiveCall: Boolean,
|
||||
): MatrixWidgetSettings
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class DefaultCallWidgetSettingsProvider(
|
|||
widgetId: String,
|
||||
encrypted: Boolean,
|
||||
direct: Boolean,
|
||||
voiceOnly: Boolean,
|
||||
isAudioCall: Boolean,
|
||||
hasActiveCall: Boolean
|
||||
): MatrixWidgetSettings {
|
||||
val isAnalyticsEnabled = analyticsService.userConsentFlow.first()
|
||||
|
|
@ -60,11 +60,11 @@ class DefaultCallWidgetSettingsProvider(
|
|||
// skipLobby = null,
|
||||
intent = when {
|
||||
direct && hasActiveCall -> {
|
||||
if (voiceOnly) CallIntent.JOIN_EXISTING_DM_VOICE else CallIntent.JOIN_EXISTING_DM
|
||||
if (isAudioCall) CallIntent.JOIN_EXISTING_DM_VOICE else CallIntent.JOIN_EXISTING_DM
|
||||
}
|
||||
hasActiveCall -> CallIntent.JOIN_EXISTING
|
||||
direct -> {
|
||||
if (voiceOnly) CallIntent.START_CALL_DM_VOICE else CallIntent.START_CALL_DM
|
||||
if (isAudioCall) CallIntent.START_CALL_DM_VOICE else CallIntent.START_CALL_DM
|
||||
}
|
||||
else -> CallIntent.START_CALL
|
||||
}.also {
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ class FakeCallWidgetSettingsProvider(
|
|||
widgetId: String,
|
||||
encrypted: Boolean,
|
||||
direct: Boolean,
|
||||
voiceOnly: Boolean,
|
||||
isAudioCall: Boolean,
|
||||
hasActiveCall: Boolean
|
||||
): MatrixWidgetSettings {
|
||||
providedBaseUrls += baseUrl
|
||||
return provideFn(baseUrl, widgetId, encrypted, direct, voiceOnly, hasActiveCall)
|
||||
return provideFn(baseUrl, widgetId, encrypted, direct, isAudioCall, hasActiveCall)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue