From 88ceffeee2e30a93dd88afb89e0ef0b0f5ad51cd Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Wed, 17 Jan 2024 08:47:27 +1100
Subject: [PATCH] Investigation in progress

---
 .../thoughtcrime/securesms/components/SearchToolbar.java    | 4 ++++
 .../conversation/v2/menus/ConversationMenuHelper.kt         | 6 ++++++
 .../java/org/thoughtcrime/securesms/home/HomeActivity.kt    | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
index 8a56acd658..e9af37b05d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.util.AnimationCompleteListener;
 
 import network.loki.messenger.R;
@@ -69,6 +70,9 @@ public class SearchToolbar extends LinearLayout {
 
       @Override
       public boolean onQueryTextChange(String newText) {
+
+        Log.d("[ACL]", "IT'S NOT THIS ONE - Search text changed to: " + newText);
+
         return onQueryTextSubmit(newText);
       }
     });
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index 02ee4ae45f..d2459a952d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -29,6 +29,7 @@ import org.session.libsession.utilities.GroupUtil.doubleDecodeGroupID
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.guava.Optional
 import org.session.libsignal.utilities.toHexString
 import org.thoughtcrime.securesms.MediaOverviewActivity
@@ -124,6 +125,11 @@ object ConversationMenuHelper {
             }
 
             override fun onQueryTextChange(query: String): Boolean {
+
+                // *** Crashes when searching for non-alphanumeric first char ***
+                Log.d("[ACL]", "THIS ONE - CMH search query changed to: $query")
+
+
                 context.onSearchQueryUpdated(query)
                 return true
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index f255455727..d0713860f2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -294,6 +294,9 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
 
                     val newData = contactResults + messageResults
 
+
+                    Log.d("[ACL]", "THIS IS THE GLOBAL SEARCH - Result query is: ${result.query}")
+
                     globalSearchAdapter.setNewData(result.query, newData)
                 }
             }