From e79818d78961f3e1eb5d2bd6745b69f73bdc60c6 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 11 Apr 2020 10:51:48 +0200
Subject: [PATCH] removing some redundant functions

---
 .../smsmessenger/activities/MainActivity.kt                 | 3 ++-
 .../smsmessenger/adapters/ThreadsAdapter.kt                 | 3 ++-
 .../com/simplemobiletools/smsmessenger/models/Message.kt    | 6 ------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 665248a9..0e1d4d45 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -18,6 +18,7 @@ import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.adapters.ThreadsAdapter
 import com.simplemobiletools.smsmessenger.extensions.config
 import com.simplemobiletools.smsmessenger.extensions.getMessages
+import com.simplemobiletools.smsmessenger.extensions.getThreadTitle
 import com.simplemobiletools.smsmessenger.helpers.THREAD_ID
 import com.simplemobiletools.smsmessenger.helpers.THREAD_TITLE
 import com.simplemobiletools.smsmessenger.models.Events
@@ -139,7 +140,7 @@ class MainActivity : SimpleActivity() {
                 ThreadsAdapter(this, messages, messages_list, messages_fastscroller) {
                     Intent(this, ThreadActivity::class.java).apply {
                         putExtra(THREAD_ID, (it as Message).thread)
-                        putExtra(THREAD_TITLE, it.getThreadTitle())
+                        putExtra(THREAD_TITLE, it.participants.getThreadTitle())
                         startActivity(this)
                     }
                 }.apply {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadsAdapter.kt
index dafd9d30..ae7c02a5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadsAdapter.kt
@@ -15,6 +15,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.smsmessenger.R
 import com.simplemobiletools.smsmessenger.activities.SimpleActivity
 import com.simplemobiletools.smsmessenger.extensions.deleteThread
+import com.simplemobiletools.smsmessenger.extensions.getThreadTitle
 import com.simplemobiletools.smsmessenger.extensions.loadImage
 import com.simplemobiletools.smsmessenger.helpers.refreshMessages
 import com.simplemobiletools.smsmessenger.models.Message
@@ -117,7 +118,7 @@ class ThreadsAdapter(
         view.apply {
             thread_frame.isSelected = selectedKeys.contains(message.id)
 
-            thread_address.text = message.getThreadTitle()
+            thread_address.text = message.participants.getThreadTitle()
             thread_body_short.text = message.body
             thread_date.text = message.date.formatDateOrTime(context, true)
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt
index b8de93b9..ead43bf5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/models/Message.kt
@@ -1,16 +1,10 @@
 package com.simplemobiletools.smsmessenger.models
 
-import android.graphics.Bitmap
 import android.provider.Telephony
-import com.simplemobiletools.smsmessenger.extensions.getThreadTitle
 
 data class Message(
     val id: Int, val body: String, val type: Int, val participants: ArrayList<Contact>, val date: Int, val read: Boolean, val thread: Int,
     val isMMS: Boolean, val attachment: MessageAttachment?
 ) : ThreadItem() {
     fun isReceivedMessage() = type == Telephony.Sms.MESSAGE_TYPE_INBOX
-
-    fun getThreadTitle() = participants.getThreadTitle()
-
-    fun getThreadImageUri() = participants.firstOrNull()?.photoUri
 }