Skip to content

Fixes voice call button disappearing in DM rooms with more than 2 members #5548

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

Merged
ericdecanini merged 6 commits into from
Mar 29, 2022
Merged

Fixes voice call button disappearing in DM rooms with more than 2 members #5548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
38f3b88
Adds debug test to check roomSummary for voice call button
ericdecanini Mar 15, 2022
d74d569
Adds back default to true on isWebRTCCallOptionAvailable
ericdecanini Mar 15, 2022
82ead4f
Replaces call option condition with isDirect
ericdecanini Mar 15, 2022
5d496d5
Adds changelog file
ericdecanini Mar 15, 2022
f722b2e
Removes unused import
ericdecanini Mar 15, 2022
bfd31de
Renames call option to be more agnostic
ericdecanini Mar 22, 2022
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
1 change: 1 addition & 0 deletions changelog.d/5548.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixes voice call button disappearing in DM rooms with more than 2 members
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
fun render(roomDetailViewState: RoomDetailViewState) {
val summary = roomDetailViewState.asyncRoomSummary()
val newState = if (summary?.membership != Membership.JOIN ||
roomDetailViewState.isWebRTCCallOptionAvailable() ||
roomDetailViewState.isCallOptionAvailable() ||
!roomDetailViewState.isAllowedToManageWidgets ||
roomDetailViewState.jitsiState.widgetId == null) {
State.Unmount
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ data class RoomDetailViewState(
rootThreadEventId = args.threadTimelineArgs?.rootThreadEventId
)

fun isWebRTCCallOptionAvailable() = (asyncRoomSummary.invoke()?.joinedMembersCount ?: 0) <= 2
fun isCallOptionAvailable() = asyncRoomSummary.invoke()?.isDirect ?: true

fun isSearchAvailable() = asyncRoomSummary()?.isEncrypted == false

Expand Down
6 changes: 3 additions & 3 deletions vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,10 +714,10 @@ class TimelineViewModel @AssistedInject constructor(
R.id.timeline_setting -> true
R.id.invite -> state.canInvite
R.id.open_matrix_apps -> true
R.id.voice_call -> state.isWebRTCCallOptionAvailable()
R.id.video_call -> state.isWebRTCCallOptionAvailable() || state.jitsiState.confId == null || state.jitsiState.hasJoined
R.id.voice_call -> state.isCallOptionAvailable()
R.id.video_call -> state.isCallOptionAvailable() || state.jitsiState.confId == null || state.jitsiState.hasJoined
// Show Join conference button only if there is an active conf id not joined. Otherwise fallback to default video disabled. ^
R.id.join_conference -> !state.isWebRTCCallOptionAvailable() && state.jitsiState.confId != null && !state.jitsiState.hasJoined
R.id.join_conference -> !state.isCallOptionAvailable() && state.jitsiState.confId != null && !state.jitsiState.hasJoined
R.id.search -> state.isSearchAvailable()
R.id.menu_timeline_thread_list -> vectorPreferences.areThreadMessagesEnabled()
R.id.dev_tools -> vectorPreferences.developerMode()
Expand Down
6 changes: 3 additions & 3 deletions vector/src/main/res/menu/menu_timeline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
android:title="@string/action_video_call"
android:visible="false"
app:iconTint="?colorPrimary"
app:showAsAction="always"
app:showAsAction="ifRoom"
tools:visible="true" />

<item
Expand All @@ -34,7 +34,7 @@
android:title="@string/call"
android:visible="false"
app:iconTint="?colorPrimary"
app:showAsAction="always"
app:showAsAction="ifRoom"
tools:visible="true" />

<item
Expand All @@ -43,7 +43,7 @@
android:visible="false"
app:iconTint="?colorPrimary"
app:actionLayout="@layout/view_thread_notification_badge"
app:showAsAction="always"
app:showAsAction="ifRoom"
tools:visible="true" />

<item android:id="@+id/join_conference"
Expand Down