From 52305368bb9979fb366006c1359d291b762a5f58 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Tue, 29 Jun 2021 15:35:53 +1000
Subject: [PATCH] scroll to the position of a search result

---
 .../conversation/v2/ConversationActivityV2.kt | 23 ++++++++++++++++---
 .../conversation/v2/search/SearchBottomBar.kt |  2 +-
 .../res/layout/view_search_bottom_bar.xml     |  3 ++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 27b7f6a92a..36cd9d98dd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -37,10 +37,13 @@ import org.session.libsession.messaging.messages.signal.OutgoingTextMessage
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.concurrent.SimpleTask
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher
+import org.thoughtcrime.securesms.conversation.ConversationFragment
 import org.thoughtcrime.securesms.conversation.v2.dialogs.*
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarButton
 import org.thoughtcrime.securesms.conversation.v2.input_bar.InputBarDelegate
@@ -764,9 +767,9 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         searchViewModel.searchResults.observe(this, Observer { result: SearchViewModel.SearchResult? ->
             if (result == null) return@Observer
             if (result.getResults().isNotEmpty()) {
-                conversationRecyclerView.scrollToPosition(result.position)
-                val messageResult = result.getResults()[result.position]
-//                fragment.jumpToMessage(messageResult.messageRecipient.address, messageResult.receivedTimestampMs, Runnable { searchViewModel.onMissingResult() })
+                result.getResults()[result.position]?.let {
+                    jumpToMessage(it.messageRecipient.address, it.receivedTimestampMs, Runnable { searchViewModel.onMissingResult() })
+                }
             }
             this.searchBottomBar.setData(result.position, result.getResults().size)
         })
@@ -787,5 +790,19 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     override fun onSearchMoveDownPressed() {
         this.searchViewModel?.onMoveDown()
     }
+
+    private fun jumpToMessage(author: Address, timestamp: Long, onMessageNotFound: Runnable?) {
+        SimpleTask.run(lifecycle, {
+            DatabaseFactory.getMmsSmsDatabase(this).getMessagePositionInConversation(threadID, timestamp, author)
+        }) { p: Int -> moveToMessagePosition(p, onMessageNotFound) }
+    }
+
+    private fun moveToMessagePosition(position: Int, onMessageNotFound: Runnable?) {
+        if (position >= 0) {
+            conversationRecyclerView.scrollToPosition(position)
+        } else {
+            onMessageNotFound?.run()
+        }
+    }
     // endregion
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt
index 9565e6e107..da8df0045a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/search/SearchBottomBar.kt
@@ -36,7 +36,7 @@ class SearchBottomBar : LinearLayout {
         if (count > 0) {
             searchPosition.text = resources.getString(R.string.ConversationActivity_search_position, position + 1, count)
         } else {
-            searchPosition.setText(R.string.ConversationActivity_no_results)
+            searchPosition.text = ""
         }
         setViewEnabled(searchUp, position < count - 1)
         setViewEnabled(searchDown, position > 0)
diff --git a/app/src/main/res/layout/view_search_bottom_bar.xml b/app/src/main/res/layout/view_search_bottom_bar.xml
index e794e75205..bb0395d28e 100644
--- a/app/src/main/res/layout/view_search_bottom_bar.xml
+++ b/app/src/main/res/layout/view_search_bottom_bar.xml
@@ -52,7 +52,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="37 of 73" />
+            android:text="37 of 73"
+            android:textStyle="bold"/>
 
         <com.github.ybq.android.spinkit.SpinKitView
             style="@style/SpinKitView.DoubleBounce"