fenix/Simple-SMS-Messenger
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git synced 2025-02-16 19:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use 'application/txt' when sending text files

Browse Source
This commit is contained in:
Naveen 2022-11-07 15:35:57 +05:30
parent 40a77118bf
commit 1e67cd0fdf
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View File

@ -901,7 +901,11 @@ class ThreadActivity : SimpleActivity() {
}
thread_attachments_recyclerview.beVisible()
val mimeType = contentResolver.getType(uri).orEmpty()
val mimeType = contentResolver.getType(uri)
if (mimeType == null) {
toast(R.string.unknown_error_occurred)
return
}
val attachment = AttachmentSelection(
id = id,
uri = uri,

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/String.kt
View File

@ -43,3 +43,7 @@ fun String.isPdfMimeType(): Boolean {
fun String.isZipMimeType(): Boolean {
return lowercase().endsWith("zip")
}
fun String.isPlainTextMimeType(): Boolean {
return lowercase().startsWith("text")
}

7
app/src/main/kotlin/com/simplemobiletools/smsmessenger/helpers/Messaging.kt
View File

@ -14,6 +14,7 @@ import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.helpers.isMarshmallowPlus
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.extensions.config
import com.simplemobiletools.smsmessenger.extensions.isPlainTextMimeType
import com.simplemobiletools.smsmessenger.models.Attachment
import com.simplemobiletools.smsmessenger.models.Message
import com.simplemobiletools.smsmessenger.receivers.ScheduledMessageReceiver
@ -49,7 +50,11 @@ fun Context.sendMessage(text: String, addresses: List<String>, subscriptionId: I
val uri = attachment.getUri()
contentResolver.openInputStream(uri)?.use {
val bytes = it.readBytes()
val mimeType = contentResolver.getType(uri) ?: return@use
val mimeType = if (attachment.mimetype.isPlainTextMimeType()) {
"application/txt"
} else {
attachment.mimetype
}
val name = attachment.filename
message.addMedia(bytes, mimeType, name, name)
}