Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable attach file & voice messages in chat if no file transfer server URL is set

Browse source
This commit is contained in:
Sylvain Berfini 2023-06-20 15:12:12 +02:00
parent 197ceb9e69
commit 226095bec7
8 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
View file

@ -107,6 +107,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
val isEmojiPickerVisible = MutableLiveData<Boolean>()
val isFileTransferAvailable = MutableLiveData<Boolean>()
val requestKeyboardHidingEvent: MutableLiveData<Event<Boolean>> by lazy {
MutableLiveData<Event<Boolean>>()
}
@ -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()
}

5
app/src/main/java/org/linphone/utils/LinphoneUtils.kt
View file

@ -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,

1
app/src/main/res/layout/chat_room_detail_fragment.xml
View file

@ -44,6 +44,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/backgroundColor"
android:clickable="true">
<LinearLayout

3
app/src/main/res/layout/chat_room_master_fragment.xml
View file

@ -34,7 +34,8 @@
<RelativeLayout
android:layout_width="@dimen/master_fragment_width"
android:layout_height="match_parent"
android:layout_gravity="start">
android:layout_gravity="start"
android:background="?attr/backgroundColor">
<LinearLayout
android:id="@+id/top_bar"

3
app/src/main/res/layout/chat_room_sending.xml
View file

@ -126,7 +126,7 @@
android:layout_height="0dp"
android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
android:contentDescription="@string/content_description_attach_file"
android:enabled="@{chatSendingViewModel.attachFileEnabled &amp;&amp; !chatSendingViewModel.attachFilePending}"
android:enabled="@{chatSendingViewModel.attachFileEnabled &amp;&amp; !chatSendingViewModel.attachFilePending &amp;&amp; chatSendingViewModel.isFileTransferAvailable}"
android:onClick="@{attachFileClickListener}"
android:paddingTop="@dimen/chat_message_sending_icons_margin"
android:paddingBottom="@dimen/chat_message_sending_icons_margin"
@ -147,6 +147,7 @@
android:paddingTop="@dimen/chat_message_sending_icons_margin"
android:paddingBottom="@dimen/chat_message_sending_icons_margin"
android:selected="@{chatSendingViewModel.isVoiceRecording}"
android:enabled="@{chatSendingViewModel.isFileTransferAvailable}"
android:src="@drawable/record_audio_message"
app:layout_constraintHeight_max="@dimen/chat_message_sending_icons_size"
app:layout_constraintBottom_toBottomOf="@id/message"

1
app/src/main/res/layout/contact_master_fragment.xml
View file

@ -31,6 +31,7 @@
<RelativeLayout
android:layout_width="@dimen/master_fragment_width"
android:layout_height="match_parent"
android:background="?attr/backgroundColor"
android:layout_gravity="start">
<LinearLayout

1
app/src/main/res/layout/history_master_fragment.xml
View file

@ -23,6 +23,7 @@
<RelativeLayout
android:layout_width="@dimen/master_fragment_width"
android:layout_height="match_parent"
android:background="?attr/backgroundColor"
android:layout_gravity="start">
<LinearLayout

1
app/src/main/res/layout/settings_fragment.xml
View file

@ -20,6 +20,7 @@
<RelativeLayout
android:layout_width="@dimen/master_fragment_width"
android:layout_height="match_parent"
android:background="?attr/backgroundColor"
android:layout_gravity="start">
<LinearLayout