From 226095bec7c5907d19a2cb969a192ed8e38b9fca Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Jun 2023 15:12:12 +0200 Subject: [PATCH] Disable attach file & voice messages in chat if no file transfer server URL is set --- .../main/chat/viewmodels/ChatMessageSendingViewModel.kt | 3 +++ app/src/main/java/org/linphone/utils/LinphoneUtils.kt | 5 +++++ app/src/main/res/layout/chat_room_detail_fragment.xml | 1 + app/src/main/res/layout/chat_room_master_fragment.xml | 3 ++- app/src/main/res/layout/chat_room_sending.xml | 3 ++- app/src/main/res/layout/contact_master_fragment.xml | 1 + app/src/main/res/layout/history_master_fragment.xml | 1 + app/src/main/res/layout/settings_fragment.xml | 1 + 8 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt index 1c0c7d08c..c085805e4 100644 --- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt +++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt @@ -107,6 +107,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() val isEmojiPickerVisible = MutableLiveData() + val isFileTransferAvailable = MutableLiveData() + val requestKeyboardHidingEvent: MutableLiveData> by lazy { MutableLiveData>() } @@ -146,6 +148,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel() sendMessageEnabled.value = false isEmojiPickerOpen.value = false isEmojiPickerVisible.value = corePreferences.showEmojiPickerButton + isFileTransferAvailable.value = LinphoneUtils.isFileTransferAvailable() updateChatRoomReadOnlyState() } diff --git a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt index 47c095644..96ca6032d 100644 --- a/app/src/main/java/org/linphone/utils/LinphoneUtils.kt +++ b/app/src/main/java/org/linphone/utils/LinphoneUtils.kt @@ -288,6 +288,11 @@ class LinphoneUtils { return true } + fun isFileTransferAvailable(): Boolean { + val core = coreContext.core + return core.fileTransferServer.orEmpty().isNotEmpty() + } + fun hashPassword( userId: String, password: String, diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml index 0a5dfeb6f..17f074c36 100644 --- a/app/src/main/res/layout/chat_room_detail_fragment.xml +++ b/app/src/main/res/layout/chat_room_detail_fragment.xml @@ -44,6 +44,7 @@ + android:layout_gravity="start" + android:background="?attr/backgroundColor">