mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finished sending files through chat

Browse source
This commit is contained in:
Sylvain Berfini 2023-11-09 13:32:06 +01:00
parent 116ca3cbfe
commit 16bf6bfc2c
6 changed files with 89 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt
View file

@ -165,6 +165,7 @@ class ConversationFragment : GenericFragment() {
}
override fun goBack(): Boolean {
coreContext.notificationsManager.resetCurrentlyDisplayedChatRoomId()
sharedViewModel.closeSlidingPaneEvent.value = Event(true)
// If not done, when going back to ConversationsFragment this fragment will be created again
return findNavController().popBackStack()
@ -227,10 +228,6 @@ class ConversationFragment : GenericFragment() {
startPostponedEnterTransition()
sharedViewModel.openSlidingPaneEvent.value = Event(true)
}
if (currentCount < items.size) {
binding.eventsList.scrollToPosition(items.size - 1)
}
}
bottomSheetAdapter = ChatMessageBottomSheetAdapter(viewLifecycleOwner)
@ -412,6 +409,8 @@ class ConversationFragment : GenericFragment() {
if (viewModel.scrollingPosition != SCROLLING_POSITION_NOT_SET) {
binding.eventsList.scrollToPosition(viewModel.scrollingPosition)
} else {
binding.eventsList.scrollToPosition(adapter.itemCount - 1)
}
try {

9
app/src/main/java/org/linphone/ui/main/chat/model/FileModel.kt
View file

@ -1,5 +1,6 @@
package org.linphone.ui.main.chat.model
import android.webkit.MimeTypeMap
import androidx.annotation.AnyThread
import androidx.annotation.UiThread
import androidx.lifecycle.MutableLiveData
@ -14,10 +15,18 @@ class FileModel @AnyThread constructor(
private const val TAG = "[File Model]"
}
val fileName: String = FileUtils.getNameFromFilePath(file)
val path = MutableLiveData<String>()
val mimeType: FileUtils.MimeType
init {
path.postValue(file)
val extension = FileUtils.getExtensionFromFileName(file)
val mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
mimeType = FileUtils.getMimeType(mime)
}
@UiThread

32
app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationViewModel.kt
View file

@ -42,6 +42,7 @@ import org.linphone.ui.main.chat.model.ParticipantModel
import org.linphone.ui.main.contacts.model.ContactAvatarModel
import org.linphone.utils.AppUtils
import org.linphone.utils.Event
import org.linphone.utils.FileUtils
import org.linphone.utils.LinphoneUtils
class ConversationViewModel @UiThread constructor() : ViewModel() {
@ -364,6 +365,28 @@ class ConversationViewModel @UiThread constructor() : ViewModel() {
message.addUtf8TextContent(toSend)
}
for (attachment in attachments.value.orEmpty()) {
val content = Factory.instance().createContent()
content.type = when (attachment.mimeType) {
FileUtils.MimeType.Image -> "image"
FileUtils.MimeType.Audio -> "audio"
FileUtils.MimeType.Video -> "video"
FileUtils.MimeType.Pdf -> "application"
FileUtils.MimeType.PlainText -> "text"
else -> "file"
}
content.subtype = if (attachment.mimeType == FileUtils.MimeType.PlainText) {
"plain"
} else {
FileUtils.getExtensionFromFileName(attachment.fileName)
}
content.name = attachment.fileName
content.filePath = attachment.file // Let the file body handler take care of the upload
message.addFileContent(content)
}
if (message.contents.isNotEmpty()) {
Log.i("$TAG Sending message")
message.send()
@ -372,6 +395,14 @@ class ConversationViewModel @UiThread constructor() : ViewModel() {
Log.i("$TAG Message sent, re-setting defaults")
textToSend.postValue("")
isReplying.postValue(false)
isFileAttachmentsListOpen.postValue(false)
isParticipantsListOpen.postValue(false)
isEmojiPickerOpen.postValue(false)
// Warning: do not delete files
val attachmentsList = arrayListOf<FileModel>()
attachments.postValue(attachmentsList)
chatMessageToReplyTo = null
}
}
@ -545,7 +576,6 @@ class ConversationViewModel @UiThread constructor() : ViewModel() {
@WorkerThread
private fun getEventsListFromHistory(history: Array<EventLog>, filter: String = ""): ArrayList<EventLogModel> {
var xFirstEventsSubmitted = false
val eventsList = arrayListOf<EventLogModel>()
val groupedEventLogs = arrayListOf<EventLog>()
for (event in history) {

3
app/src/main/java/org/linphone/utils/DataBindingUtils.kt
View file

@ -259,7 +259,8 @@ private fun loadImageForChatBubble(imageView: ImageView, file: String?, grid: Bo
}
} else {
imageView.load(file) {
transformations(RoundedCornersTransformation(radius))
// Can't have a transformation for gif file, breaks animation
// transformations(RoundedCornersTransformation(radius))
size(width, height)
listener(
onError = { _, result ->

76
app/src/main/java/org/linphone/utils/FileUtils.kt
View file

@ -52,6 +52,49 @@ class FileUtils {
companion object {
private const val TAG = "[File Utils]"
@AnyThread
fun isExtensionVideo(path: String): Boolean {
val extension = getExtensionFromFileName(path)
val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
return getMimeType(type) == MimeType.Video
}
@AnyThread
fun getExtensionFromFileName(fileName: String): String {
var extension = MimeTypeMap.getFileExtensionFromUrl(fileName)
if (extension.isNullOrEmpty()) {
val i = fileName.lastIndexOf('.')
if (i > 0) {
extension = fileName.substring(i + 1)
}
}
return extension.lowercase(Locale.getDefault())
}
@AnyThread
fun getMimeType(type: String?): MimeType {
if (type.isNullOrEmpty()) return MimeType.Unknown
return when {
type.startsWith("image/") -> MimeType.Image
type.startsWith("text/plain") -> MimeType.PlainText
type.startsWith("video/") -> MimeType.Video
type.startsWith("audio/") -> MimeType.Audio
type.startsWith("application/pdf") -> MimeType.Pdf
else -> MimeType.Unknown
}
}
@AnyThread
fun getNameFromFilePath(filePath: String): String {
var name = filePath
val i = filePath.lastIndexOf('/')
if (i > 0) {
name = filePath.substring(i + 1)
}
return name
}
@AnyThread
fun getProperFilePath(path: String): String {
if (path.startsWith("file:") || path.startsWith("content:")) {
@ -271,38 +314,5 @@ class FileUtils {
}
return name
}
@AnyThread
fun isExtensionVideo(path: String): Boolean {
val extension = getExtensionFromFileName(path)
val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
return getMimeType(type) == MimeType.Video
}
@AnyThread
private fun getExtensionFromFileName(fileName: String): String {
var extension = MimeTypeMap.getFileExtensionFromUrl(fileName)
if (extension.isNullOrEmpty()) {
val i = fileName.lastIndexOf('.')
if (i > 0) {
extension = fileName.substring(i + 1)
}
}
return extension.lowercase(Locale.getDefault())
}
@AnyThread
private fun getMimeType(type: String?): MimeType {
if (type.isNullOrEmpty()) return MimeType.Unknown
return when {
type.startsWith("image/") -> MimeType.Image
type.startsWith("text/plain") -> MimeType.PlainText
type.startsWith("video/") -> MimeType.Video
type.startsWith("audio/") -> MimeType.Audio
type.startsWith("application/pdf") -> MimeType.Pdf
else -> MimeType.Unknown
}
}
}
}

2
app/src/main/res/layout/chat_conversation_send_area.xml
View file

@ -146,7 +146,7 @@
android:layout_width="40dp"
android:layout_height="0dp"
android:layout_marginEnd="4dp"
android:enabled="@{viewModel.textToSend.length() > 0}"
android:enabled="@{viewModel.textToSend.length() > 0 || viewModel.attachments.size() > 0}"
android:onClick="@{() -> viewModel.sendMessage()}"
android:padding="8dp"
android:src="@drawable/paper_plane_tilt"