Merge pull request #5548 from vector-im/bugfix/eric/call-button-disap…

…pearing Fixes voice call button disappearing in DM rooms with more than 2 members
element-hq · Mar 29, 2022 · 9c333c9 · 9c333c9
2 parents 539d198 + bfd31de
commit 9c333c9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/changelog.d/5548.bugfix b/changelog.d/5548.bugfix
@@ -0,0 +1 @@
+Fixes voice call button disappearing in DM rooms with more than 2 members
diff --git a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt
@@ -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

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
@@ -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
 

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -713,10 +713,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()

diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
@@ -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
@@ -34,7 +34,7 @@
         android:title="@string/call"
         android:visible="false"
         app:iconTint="?colorPrimary"
-        app:showAsAction="always"
+        app:showAsAction="ifRoom"
         tools:visible="true" />
 
     <item
@@ -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"
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