From 4cad41347835da292630fc6a134c2da1b9404018 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 21 Dec 2020 15:29:10 +0100
Subject: [PATCH] store attachment uri as a string

---
 .../smsmessenger/activities/ThreadActivity.kt                 | 4 ++--
 .../simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt  | 2 +-
 .../com/simplemobiletools/smsmessenger/extensions/Context.kt  | 4 ++--
 .../com/simplemobiletools/smsmessenger/models/Attachment.kt   | 4 +++-
 .../simplemobiletools/smsmessenger/receivers/MmsReceiver.kt   | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 6d926341..931c9ad9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -146,12 +146,12 @@ class ThreadActivity : SimpleActivity() {
                         if (it.mimetype.startsWith("image/")) {
                             val fileOptions = BitmapFactory.Options()
                             fileOptions.inJustDecodeBounds = true
-                            BitmapFactory.decodeStream(contentResolver.openInputStream(it.uri), null, fileOptions)
+                            BitmapFactory.decodeStream(contentResolver.openInputStream(it.getUri()), null, fileOptions)
                             it.width = fileOptions.outWidth
                             it.height = fileOptions.outHeight
                         } else if (it.mimetype.startsWith("video/")) {
                             val metaRetriever = MediaMetadataRetriever()
-                            metaRetriever.setDataSource(this, it.uri)
+                            metaRetriever.setDataSource(this, it.getUri())
                             it.width = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH)!!.toInt()
                             it.height = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT)!!.toInt()
                         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
index 0702dd4c..fe750b20 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
@@ -225,7 +225,7 @@ class ThreadAdapter(activity: SimpleActivity, var messages: ArrayList<ThreadItem
             if (message.attachment?.attachments?.isNotEmpty() == true) {
                 for (attachment in message.attachment.attachments) {
                     val mimetype = attachment.mimetype
-                    val uri = attachment.uri
+                    val uri = attachment.getUri()
                     if (mimetype.startsWith("image/") || mimetype.startsWith("video/")) {
                         val imageView = layoutInflater.inflate(R.layout.item_attachment_image, null)
                         thread_mesage_attachments_holder.addView(imageView)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index 08a6e439..79673bf6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -262,10 +262,10 @@ fun Context.getMmsAttachment(id: Long): MessageAttachment {
         if (mimetype == "text/plain") {
             messageAttachment.text = cursor.getStringValue(Mms.Part.TEXT) ?: ""
         } else if (mimetype.startsWith("image/") || mimetype.startsWith("video/")) {
-            val attachment = Attachment(Uri.withAppendedPath(uri, partId), mimetype, 0, 0, "")
+            val attachment = Attachment(Uri.withAppendedPath(uri, partId).toString(), mimetype, 0, 0, "")
             messageAttachment.attachments.add(attachment)
         } else if (mimetype != "application/smil") {
-            val attachment = Attachment(Uri.withAppendedPath(uri, partId), mimetype, 0, 0, attachmentName)
+            val attachment = Attachment(Uri.withAppendedPath(uri, partId).toString(), mimetype, 0, 0, attachmentName)
             messageAttachment.attachments.add(attachment)
         } else {
             val text = cursor.getStringValue(Mms.Part.TEXT)
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt
index f7f4ab7a..dec7cd1b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Attachment.kt
@@ -2,4 +2,6 @@ package com.simplemobiletools.smsmessenger.models
 
 import android.net.Uri
 
-data class Attachment(var uri: Uri, var mimetype: String, var width: Int, var height: Int, var filename: String)
+data class Attachment(var uriString: String, var mimetype: String, var width: Int, var height: Int, var filename: String) {
+    fun getUri() = Uri.parse(uriString)
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt
index e8ae7d76..53add47b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/receivers/MmsReceiver.kt
@@ -24,7 +24,7 @@ class MmsReceiver : com.klinker.android.send_message.MmsReceivedReceiver() {
             val glideBitmap = try {
                 Glide.with(context)
                     .asBitmap()
-                    .load(mms.attachment!!.attachments.first().uri)
+                    .load(mms.attachment!!.attachments.first().getUri())
                     .centerCrop()
                     .into(size, size)
                     .get()