From 37d063a3c9c923b998693551b7af7d2011a09342 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 15 Feb 2021 23:39:57 +0100
Subject: [PATCH] fill out the other ends name, if we sent the message with
 searched text

---
 .../smsmessenger/activities/SearchActivity.kt            | 9 ++++++++-
 app/src/main/res/layout/item_search_result.xml           | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
index 999b9146..1236e0f3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SearchActivity.kt
@@ -5,6 +5,7 @@ import android.app.SearchManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.widget.SearchView
@@ -93,8 +94,14 @@ class SearchActivity : SimpleActivity() {
                     }
 
                     messages.forEach { message ->
+                        var recipient = message.senderName
+                        if (recipient.isEmpty() && message.participants.isNotEmpty()) {
+                            val participantNames = message.participants.map { it.name }
+                            recipient = TextUtils.join(", ", participantNames)
+                        }
+
                         val date = message.date.formatDateOrTime(this, true, true)
-                        val searchResult = SearchResult(message.senderName, message.body, date, message.threadId)
+                        val searchResult = SearchResult(recipient, message.body, date, message.threadId)
                         searchResults.add(searchResult)
                     }
 
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 29d5d9b5..f2e479b7 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -33,10 +33,13 @@
     <TextView
         android:id="@+id/search_result_date"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignTop="@+id/search_result_title"
+        android:layout_alignBottom="@+id/search_result_title"
         android:layout_alignParentEnd="true"
         android:layout_marginTop="@dimen/tiny_margin"
         android:alpha="0.7"
+        android:gravity="center_vertical"
         android:textSize="@dimen/smaller_text_size"
         tools:text="08/02/2021" />