fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try harder at opening unknown attachments, guess mimetype from filename

This commit is contained in:
tibbi 2020-04-12 23:30:34 +02:00
parent c4e7fc3068
commit a40438a08c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
View File

@ -228,7 +228,7 @@ class ThreadAdapter(
}
builder.into(imageView.attachment_image)
imageView.attachment_image.setOnClickListener { launchViewIntent(uri, mimetype) }
imageView.attachment_image.setOnClickListener { launchViewIntent(uri, mimetype, attachment.filename) }
} else {
if (message.isReceivedMessage()) {
val attachmentView = layoutInflater.inflate(R.layout.item_received_unknown_attachment, null).apply {
@ -237,7 +237,7 @@ class ThreadAdapter(
thread_received_attachment_label.text = attachment.filename
}
setTextColor(textColor)
setOnClickListener { launchViewIntent(uri, mimetype) }
setOnClickListener { launchViewIntent(uri, mimetype, attachment.filename) }
}
}
thread_mesage_attachments_holder.addView(attachmentView)
@ -250,7 +250,7 @@ class ThreadAdapter(
if (attachment.filename.isNotEmpty()) {
thread_sent_attachment_label.text = attachment.filename
}
setOnClickListener { launchViewIntent(uri, mimetype) }
setOnClickListener { launchViewIntent(uri, mimetype, attachment.filename) }
}
}
thread_mesage_attachments_holder.addView(attachmentView)
@ -263,7 +263,7 @@ class ThreadAdapter(
}
}
private fun launchViewIntent(uri: Uri, mimetype: String) {
private fun launchViewIntent(uri: Uri, mimetype: String, filename: String) {
Intent().apply {
action = Intent.ACTION_VIEW
setDataAndType(uri, mimetype)
@ -272,7 +272,12 @@ class ThreadAdapter(
if (resolveActivity(activity.packageManager) != null) {
activity.startActivity(this)
} else {
activity.toast(R.string.no_app_found)
val newMimetype = filename.getMimeType()
if (newMimetype.isNotEmpty() && mimetype != newMimetype) {
launchViewIntent(uri, newMimetype, filename)
} else {
activity.toast(R.string.no_app_found)
}
}
}
}