Commit de8e048a authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Check if Jitsi is enabled for channels.

parent 8d07f279
...@@ -73,7 +73,7 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView { ...@@ -73,7 +73,7 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
private lateinit var viewModel: ChatDetailsViewModel private lateinit var viewModel: ChatDetailsViewModel
internal lateinit var chatRoomId: String internal lateinit var chatRoomId: String
private lateinit var chatRoomType: String internal lateinit var chatRoomType: String
private var isSubscribed: Boolean = true private var isSubscribed: Boolean = true
internal var isFavorite: Boolean = false internal var isFavorite: Boolean = false
private var disableMenu: Boolean = false private var disableMenu: Boolean = false
......
...@@ -4,10 +4,17 @@ import android.view.Menu ...@@ -4,10 +4,17 @@ import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import chat.rocket.android.R import chat.rocket.android.R
import chat.rocket.android.server.domain.isJitsiEnabled import chat.rocket.android.server.domain.isJitsiEnabled
import chat.rocket.android.server.domain.isJitsiEnabledForChannels
import chat.rocket.common.model.RoomType
import chat.rocket.common.model.roomTypeOf
internal fun ChatDetailsFragment.setupMenu(menu: Menu) { internal fun ChatDetailsFragment.setupMenu(menu: Menu) {
serverUrl.get()?.let { serverUrl.get()?.let {
if (settings.get(it).isJitsiEnabled()) { with(settings.get(it)) {
if (isJitsiEnabled()) {
if (roomTypeOf(chatRoomType) !is RoomType.DirectMessage && !isJitsiEnabledForChannels()) {
return
}
menu.add( menu.add(
Menu.NONE, Menu.NONE,
MENU_ACTION_VIDEO_CALL, MENU_ACTION_VIDEO_CALL,
...@@ -16,6 +23,7 @@ internal fun ChatDetailsFragment.setupMenu(menu: Menu) { ...@@ -16,6 +23,7 @@ internal fun ChatDetailsFragment.setupMenu(menu: Menu) {
).setIcon(R.drawable.ic_video_24dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM) ).setIcon(R.drawable.ic_video_24dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
} }
} }
}
if (isFavorite) { if (isFavorite) {
menu.add( menu.add(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment