From 916f705c50deabe69f9cb92771285fff7b53dd0f Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 31 Jul 2023 14:44:43 +0930
Subject: [PATCH 01/46] Prefix message with name in HomeActivity

---
 .../securesms/database/MmsSmsDatabase.java    | 10 +++++++
 .../securesms/database/ThreadDatabase.java    | 10 ++++++-
 .../database/model/ThreadRecord.java          |  4 ++-
 .../securesms/home/ConversationView.kt        | 29 +++++++++++++------
 4 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index 0db4dd00e5..3d175fd8bd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -209,6 +209,16 @@ public class MmsSmsDatabase extends Database {
     }
   }
 
+  public long getLastMessageTimestamp(long threadId) {
+    String order     = MmsSmsColumns.NORMALIZED_DATE_SENT + " DESC";
+    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
+
+    try (Cursor cursor = queryTables(PROJECTION, selection, order, "1")) {
+      cursor.moveToFirst();
+      return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_SENT));
+    }
+  }
+
   public Cursor getUnread() {
     String order           = MmsSmsColumns.NORMALIZED_DATE_SENT + " ASC";
     String selection       = "(" + MmsSmsColumns.READ + " = 0 OR " + MmsSmsColumns.REACTIONS_UNREAD + " = 1) AND " + MmsSmsColumns.NOTIFIED + " = 0";
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 5044529981..c525f05e7d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -951,7 +951,9 @@ public class ThreadDatabase extends Database {
         readReceiptCount = 0;
       }
 
-      return new ThreadRecord(body, snippetUri, recipient, date, count,
+      MessageRecord lastMessage = count > 0 ? getLastMessage(threadId) : null;
+
+      return new ThreadRecord(body, snippetUri, lastMessage, recipient, date, count,
                               unreadCount, unreadMentionCount, threadId, deliveryReceiptCount, status, type,
                               distributionType, archived, expiresIn, lastSeen, readReceiptCount, pinned);
     }
@@ -976,4 +978,10 @@ public class ThreadDatabase extends Database {
       }
     }
   }
+
+  private MessageRecord getLastMessage(long threadId) {
+    MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
+    long messageTimestamp = mmsSmsDatabase.getLastMessageTimestamp(threadId);
+    return mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
+  }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index f3e72a8747..0c023a8f29 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -43,6 +43,7 @@ import network.loki.messenger.R;
 public class ThreadRecord extends DisplayRecord {
 
   private @Nullable final Uri     snippetUri;
+  public @Nullable  final MessageRecord lastMessage;
   private           final long    count;
   private           final int     unreadCount;
   private           final int     unreadMentionCount;
@@ -54,13 +55,14 @@ public class ThreadRecord extends DisplayRecord {
   private           final int initialRecipientHash;
 
   public ThreadRecord(@NonNull String body, @Nullable Uri snippetUri,
-                      @NonNull Recipient recipient, long date, long count, int unreadCount,
+                      @Nullable MessageRecord lastMessage, @NonNull Recipient recipient, long date, long count, int unreadCount,
                       int unreadMentionCount, long threadId, int deliveryReceiptCount, int status,
                       long snippetType,  int distributionType, boolean archived, long expiresIn,
                       long lastSeen, int readReceiptCount, boolean pinned)
   {
     super(body, recipient, date, date, threadId, status, deliveryReceiptCount, snippetType, readReceiptCount);
     this.snippetUri         = snippetUri;
+    this.lastMessage        = lastMessage;
     this.count              = count;
     this.unreadCount        = unreadCount;
     this.unreadMentionCount = unreadMentionCount;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 31b281c6de..454bcef18d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.content.res.Resources
 import android.graphics.Typeface
 import android.graphics.drawable.ColorDrawable
+import android.text.SpannableString
+import android.text.TextUtils
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.View
@@ -89,7 +91,7 @@ class ConversationView : LinearLayout {
                 || (configFactory.convoVolatile?.getConversationUnread(thread) == true)
         binding.unreadMentionTextView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
         binding.unreadMentionIndicator.isVisible = (thread.unreadMentionCount != 0 && thread.recipient.address.isGroup)
-        val senderDisplayName = getUserDisplayName(thread.recipient)
+        val senderDisplayName = getTitle(thread.recipient)
                 ?: thread.recipient.address.toString()
         binding.conversationViewDisplayNameTextView.text = senderDisplayName
         binding.timestampTextView.text = DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), thread.date)
@@ -101,9 +103,7 @@ class ConversationView : LinearLayout {
             R.drawable.ic_notifications_mentions
         }
         binding.muteIndicatorImageView.setImageResource(drawableRes)
-        val rawSnippet = thread.getDisplayBody(context)
-        val snippet = highlightMentions(rawSnippet, thread.threadId, context)
-        binding.snippetTextView.text = snippet
+        binding.snippetTextView.text = highlightMentions(getSnippet(thread), thread.threadId, context)
         binding.snippetTextView.typeface = if (unreadCount > 0 && !thread.isRead) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
         binding.snippetTextView.visibility = if (isTyping) View.GONE else View.VISIBLE
         if (isTyping) {
@@ -131,11 +131,22 @@ class ConversationView : LinearLayout {
         binding.profilePictureView.recycle()
     }
 
-    private fun getUserDisplayName(recipient: Recipient): String? {
-        return if (recipient.isLocalNumber) {
-            context.getString(R.string.note_to_self)
-        } else {
-            recipient.toShortString() // Internally uses the Contact API
+    private fun getTitle(recipient: Recipient): String? = when {
+        recipient.isLocalNumber -> context.getString(R.string.note_to_self)
+        else -> recipient.toShortString() // Internally uses the Contact API
+    }
+
+    private fun getSnippet(thread: ThreadRecord): CharSequence {
+        thread.apply {
+            val body = getDisplayBody(context)
+
+            val snippetAuthor = lastMessage?.individualRecipient
+
+            return if (lastMessage?.isOutgoing == true) {
+                TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
+            } else {
+                return snippetAuthor?.toShortString()?.let { TextUtils.concat(it, ": ", body) } ?: body
+            }
         }
     }
     // endregion

From dd345cbf074bb54e7e86d1f4e2a82f446f3dd2d3 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Mon, 31 Jul 2023 19:40:20 +0930
Subject: [PATCH 02/46] Hide sender prefix for note to self

---
 .../securesms/home/ConversationView.kt         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 454bcef18d..5191e05d77 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -136,17 +136,19 @@ class ConversationView : LinearLayout {
         else -> recipient.toShortString() // Internally uses the Contact API
     }
 
-    private fun getSnippet(thread: ThreadRecord): CharSequence {
-        thread.apply {
-            val body = getDisplayBody(context)
+    private fun getSnippet(thread: ThreadRecord): CharSequence = thread.run {
+        val body = getDisplayBody(context)
 
-            val snippetAuthor = lastMessage?.individualRecipient
-
-            return if (lastMessage?.isOutgoing == true) {
+        when {
+            recipient.isLocalNumber -> body // Note to self
+            lastMessage?.isOutgoing == true -> {
                 TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
-            } else {
-                return snippetAuthor?.toShortString()?.let { TextUtils.concat(it, ": ", body) } ?: body
             }
+            else -> lastMessage
+                ?.individualRecipient
+                ?.toShortString()
+                ?.let { TextUtils.concat(it, ": ", body) }
+                ?: body
         }
     }
     // endregion

From b487d5aa6407a1b91f48346ee4a7171401828814 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Mon, 31 Jul 2023 19:48:45 +0930
Subject: [PATCH 03/46] Hide sender prefix for control messages

---
 .../java/org/thoughtcrime/securesms/home/ConversationView.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index 5191e05d77..b1bd55b20a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -140,7 +140,7 @@ class ConversationView : LinearLayout {
         val body = getDisplayBody(context)
 
         when {
-            recipient.isLocalNumber -> body // Note to self
+            recipient.isLocalNumber || lastMessage?.isControlMessage == true -> body // Note to self
             lastMessage?.isOutgoing == true -> {
                 TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
             }

From f70aa9155b04b2980da1ce726826f483ceef6c49 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 7 Aug 2023 10:26:20 +0930
Subject: [PATCH 04/46] Remove problematic getLastMessage()

---
 .../securesms/database/ThreadDatabase.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index c525f05e7d..f4ab65f56c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -951,7 +951,13 @@ public class ThreadDatabase extends Database {
         readReceiptCount = 0;
       }
 
-      MessageRecord lastMessage = count > 0 ? getLastMessage(threadId) : null;
+      MessageRecord lastMessage = null;
+
+      if (count > 0) {
+        MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
+        long messageTimestamp = mmsSmsDatabase.getLastMessageTimestamp(threadId);
+        lastMessage = mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
+      }
 
       return new ThreadRecord(body, snippetUri, lastMessage, recipient, date, count,
                               unreadCount, unreadMentionCount, threadId, deliveryReceiptCount, status, type,
@@ -978,10 +984,4 @@ public class ThreadDatabase extends Database {
       }
     }
   }
-
-  private MessageRecord getLastMessage(long threadId) {
-    MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
-    long messageTimestamp = mmsSmsDatabase.getLastMessageTimestamp(threadId);
-    return mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
-  }
 }

From 50fd3292c8b9cb45d6b7f8da212adcf2d15da2f7 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 7 Aug 2023 10:46:38 +0930
Subject: [PATCH 05/46] Refactor snippet formatting

---
 .../securesms/home/ConversationView.kt        | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
index b1bd55b20a..47a37a092a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt
@@ -103,7 +103,7 @@ class ConversationView : LinearLayout {
             R.drawable.ic_notifications_mentions
         }
         binding.muteIndicatorImageView.setImageResource(drawableRes)
-        binding.snippetTextView.text = highlightMentions(getSnippet(thread), thread.threadId, context)
+        binding.snippetTextView.text = highlightMentions(thread.getSnippet(), thread.threadId, context)
         binding.snippetTextView.typeface = if (unreadCount > 0 && !thread.isRead) Typeface.DEFAULT_BOLD else Typeface.DEFAULT
         binding.snippetTextView.visibility = if (isTyping) View.GONE else View.VISIBLE
         if (isTyping) {
@@ -136,20 +136,16 @@ class ConversationView : LinearLayout {
         else -> recipient.toShortString() // Internally uses the Contact API
     }
 
-    private fun getSnippet(thread: ThreadRecord): CharSequence = thread.run {
-        val body = getDisplayBody(context)
+    private fun ThreadRecord.getSnippet(): CharSequence =
+        concatSnippet(getSnippetPrefix(), getDisplayBody(context))
 
-        when {
-            recipient.isLocalNumber || lastMessage?.isControlMessage == true -> body // Note to self
-            lastMessage?.isOutgoing == true -> {
-                TextUtils.concat(resources.getString(R.string.MessageRecord_you), ": ", body)
-            }
-            else -> lastMessage
-                ?.individualRecipient
-                ?.toShortString()
-                ?.let { TextUtils.concat(it, ": ", body) }
-                ?: body
-        }
+    private fun concatSnippet(prefix: CharSequence?, body: CharSequence): CharSequence =
+        prefix?.let { TextUtils.concat(it, ": ", body) } ?: body
+
+    private fun ThreadRecord.getSnippetPrefix(): CharSequence? = when {
+        recipient.isLocalNumber || lastMessage?.isControlMessage == true -> null
+        lastMessage?.isOutgoing == true -> resources.getString(R.string.MessageRecord_you)
+        else -> lastMessage?.individualRecipient?.toShortString()
     }
     // endregion
 }

From 1f6542eff367b96e733c4f488700330715937ce8 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Fri, 22 Sep 2023 00:16:10 +0930
Subject: [PATCH 06/46] Fix dialog button style

---
 .../org/thoughtcrime/securesms/SessionDialogBuilder.kt    | 7 ++-----
 .../destructive_dialog_text_button_background.xml         | 1 -
 .../unimportant_dialog_text_button_background.xml         | 1 -
 app/src/main/res/layout/dialog_clear_all_data.xml         | 8 +++-----
 app/src/main/res/layout/dialog_send_seed.xml              | 4 ++--
 app/src/main/res/values/dimens.xml                        | 1 +
 app/src/main/res/values/styles.xml                        | 1 +
 7 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index 44c30741ef..18113ea474 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -14,14 +14,12 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.setMargins
 import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
 
-
 @DslMarker
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 annotation class DialogDsl
@@ -31,6 +29,7 @@ class SessionDialogBuilder(val context: Context) {
 
     private val dp20 = toPx(20, context.resources)
     private val dp40 = toPx(40, context.resources)
+    private val dp60 = toPx(60, context.resources)
 
     private val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(context)
 
@@ -64,7 +63,6 @@ class SessionDialogBuilder(val context: Context) {
         }
     }
 
-
     private fun text(text: CharSequence?, @StyleRes style: Int, modify: TextView.() -> Unit) {
         text ?: return
         TextView(context, null, 0, style)
@@ -125,8 +123,7 @@ class SessionDialogBuilder(val context: Context) {
     ) = Button(context, null, 0, style).apply {
             setText(text)
             contentDescription = resources.getString(contentDescriptionRes)
-            layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
-                .apply { setMargins(toPx(20, resources)) }
+            layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, dp60, 1f)
             setOnClickListener {
                 listener.invoke()
                 if (dismiss) dismiss()
diff --git a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
index f3e13c8000..3ba98c4992 100644
--- a/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/destructive_dialog_text_button_background.xml
@@ -4,7 +4,6 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="?android:textColorPrimary"/>
-            <corners android:radius="@dimen/medium_button_corner_radius" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
index f3e13c8000..3ba98c4992 100644
--- a/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
+++ b/app/src/main/res/drawable/unimportant_dialog_text_button_background.xml
@@ -4,7 +4,6 @@
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="?android:textColorPrimary"/>
-            <corners android:radius="@dimen/medium_button_corner_radius" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml
index db95647dad..94d4828e21 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -6,8 +6,7 @@
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:elevation="4dp"
-    android:padding="@dimen/medium_spacing">
+    android:elevation="4dp">
 
     <TextView
         android:layout_width="wrap_content"
@@ -46,16 +45,15 @@
             style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/clearAllDataButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
-            android:layout_marginStart="@dimen/medium_spacing"
             android:text="@string/dialog_clear_all_data_clear" />
 
         <Button
             style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:text="@string/cancel" />
 
diff --git a/app/src/main/res/layout/dialog_send_seed.xml b/app/src/main/res/layout/dialog_send_seed.xml
index 1aed6f0428..725c9c4d83 100644
--- a/app/src/main/res/layout/dialog_send_seed.xml
+++ b/app/src/main/res/layout/dialog_send_seed.xml
@@ -38,7 +38,7 @@
             style="@style/Widget.Session.Button.Dialog.UnimportantText"
             android:id="@+id/cancelButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:text="@string/cancel" />
 
@@ -46,7 +46,7 @@
             style="@style/Widget.Session.Button.Dialog.DestructiveText"
             android:id="@+id/sendSeedButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/small_button_height"
+            android:layout_height="@dimen/dialog_button_height"
             android:layout_weight="1"
             android:layout_marginStart="@dimen/medium_spacing"
             android:text="@string/dialog_send_seed_send_button_title" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 99e0aa197f..b3b60c1b04 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -10,6 +10,7 @@
     <dimen name="massive_font_size">50sp</dimen>
 
     <!-- Element Sizes -->
+    <dimen name="dialog_button_height">60dp</dimen>
     <dimen name="small_button_height">34dp</dimen>
     <dimen name="medium_button_height">38dp</dimen>
     <dimen name="large_button_height">54dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2928fc7718..243a106545 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -115,6 +115,7 @@
         <item name="android:textAllCaps">false</item>
         <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:textColor">?android:textColorPrimary</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="Widget.Session.Button.Dialog.UnimportantText">

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 07/46] 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)
                 }
             }

From cfe2dbca7babb9248929405d469615f17435001e Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Wed, 17 Jan 2024 12:13:27 +1100
Subject: [PATCH 08/46] Working fix push before cleanup

---
 .../conversation/v2/ConversationActivityV2.kt |  3 ++
 .../conversation/v2/ConversationAdapter.kt    |  3 ++
 .../v2/menus/ConversationMenuHelper.kt        |  3 +-
 .../securesms/database/SearchDatabase.java    |  3 ++
 .../securesms/search/SearchRepository.java    | 46 +++++++++++++++++--
 5 files changed, 52 insertions(+), 6 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 8c566c060b..401901607a 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
@@ -2066,8 +2066,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     fun onSearchQueryUpdated(query: String) {
+        Log.d("[ACL]", "1")
         searchViewModel.onQueryUpdated(query, viewModel.threadId)
+        Log.d("[ACL]", "2")
         binding?.searchBottomBar?.showLoading()
+        Log.d("[ACL]", "3")
         adapter.onSearchQueryUpdated(query)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 6013af5ba4..1ac7419d9a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.launch
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewVisibleMessageBinding
 import org.session.libsession.messaging.contacts.Contact
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.conversation.v2.messages.ControlMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageViewDelegate
@@ -268,7 +269,9 @@ class ConversationAdapter(
     }
 
     fun onSearchQueryUpdated(query: String?) {
+        Log.d("[ACL]", "4")
         this.searchQuery = query
+        Log.d("[ACL]", "5")
         notifyDataSetChanged()
     }
 
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 d2459a952d..744dc579a6 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
@@ -127,8 +127,7 @@ 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")
-
+                Log.d("[ACL]", "[ConversationMenuHelper] Query text changed to: $query")
 
                 context.onSearchQueryUpdated(query)
                 return true
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
index eac6a5fbc3..92b0bed9a0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
@@ -10,6 +10,7 @@ import com.annimon.stream.Stream;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.session.libsession.utilities.Util;
+import org.session.libsignal.utilities.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
 import java.util.List;
@@ -118,6 +119,8 @@ public class SearchDatabase extends Database {
 
     int queryLimit = Math.min(query.length()*50,500);
 
+    Log.d("[ACL]", "[SearchDatabase] Query is:\n" + MESSAGES_QUERY);
+
     Cursor cursor = db.rawQuery(MESSAGES_QUERY, new String[] { prefixQuery, prefixQuery, String.valueOf(queryLimit) });
     setNotifyConverationListListeners(cursor);
     return cursor;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index ddfe85515c..737322d2cb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -95,6 +95,16 @@ public class SearchRepository {
       Stopwatch timer = new Stopwatch("FtsQuery");
 
       String cleanQuery = sanitizeQuery(query);
+
+      // If the search is for a single character and it was stripped by `sanitizeQuery` then abort
+      // the search for an empty string to avoid SQLite error.
+      if (cleanQuery.length() == 0)
+      {
+        Log.d(TAG, "Aborting empty search query.");
+        timer.stop(TAG);
+        return;
+      }
+
       timer.split("clean");
 
       Pair<CursorList<Contact>, List<String>> contacts = queryContacts(cleanQuery);
@@ -114,15 +124,30 @@ public class SearchRepository {
 
   public void query(@NonNull String query, long threadId, @NonNull Callback<CursorList<MessageResult>> callback) {
     if (TextUtils.isEmpty(query)) {
+      Log.d("[ACL]", "Recognised empty query!");
+
       callback.onResult(CursorList.emptyList());
       return;
     }
+    else {
+      Log.d("[ACL]", "Non-empty query is: " + query);
+    }
 
     executor.execute(() -> {
-      long startTime = System.currentTimeMillis();
-      CursorList<MessageResult> messages = queryMessages(sanitizeQuery(query), threadId);
-      Log.d(TAG, "[ConversationQuery] " + (System.currentTimeMillis() - startTime) + " ms");
 
+      Log.d("[ACL]", "Hit query.execute!");
+
+      // If the search is for a single character and it was stripped by `sanitizeQuery` then abort
+      // the search for an empty string to avoid SQLite error.
+      String cleanQuery = sanitizeQuery(query);
+      Log.d("[ACL]", "clean query is: \"" + cleanQuery + "\"");
+      if (cleanQuery.isEmpty() || cleanQuery.equalsIgnoreCase(" "))
+      {
+        Log.d("[ACL]", "Aborting empty search query.");
+        return;
+      }
+
+      CursorList<MessageResult> messages = queryMessages(cleanQuery, threadId);
       callback.onResult(messages);
     });
   }
@@ -186,12 +211,19 @@ public class SearchRepository {
   }
 
   private CursorList<MessageResult> queryMessages(@NonNull String query) {
+
+    Log.d("[ACL]", "[SearchRepository] Query is:\n" + query);
+
+
     Cursor messages = searchDatabase.queryMessages(query);
     return messages != null ? new CursorList<>(messages, new MessageModelBuilder(context))
                             : CursorList.emptyList();
   }
 
   private CursorList<MessageResult> queryMessages(@NonNull String query, long threadId) {
+
+    Log.d("[ACL]", "[SearchRepository] 6 - query is: " + query);
+
     Cursor messages = searchDatabase.queryMessages(query, threadId);
     return messages != null ? new CursorList<>(messages, new MessageModelBuilder(context))
                             : CursorList.emptyList();
@@ -205,6 +237,9 @@ public class SearchRepository {
    * However, if we replace the apostrophe with a space, then the query will find the match.
    */
   private String sanitizeQuery(@NonNull String query) {
+
+    Log.d("[ACL]", "[SearchRepository] Hit sanitizeQuery - initial query is: " + query);
+
     StringBuilder out = new StringBuilder();
 
     for (int i = 0; i < query.length(); i++) {
@@ -216,7 +251,10 @@ public class SearchRepository {
       }
     }
 
-    return out.toString();
+    Log.d("[ACL]", "[SearchRepository] Hit sanitizeQuery - sanitized query is: " + out.toString());
+
+    // Querying for an empty string causes a crash so we'll que
+    if (out.toString().length() > 0) { return out.toString(); } else { return " "; }
   }
 
   private static class ContactModelBuilder implements CursorList.ModelBuilder<Contact> {

From 09e48fdc5cb72d9136524eebfc8a976f9bab9cd0 Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Wed, 17 Jan 2024 12:51:11 +1100
Subject: [PATCH 09/46] Fixes #1346

---
 .../securesms/components/SearchToolbar.java   |  7 +---
 .../conversation/v2/ConversationActivityV2.kt |  3 --
 .../conversation/v2/ConversationAdapter.kt    |  2 --
 .../v2/menus/ConversationMenuHelper.kt        |  4 ---
 .../securesms/database/SearchDatabase.java    |  4 ---
 .../securesms/home/HomeActivity.kt            |  4 ---
 .../securesms/search/SearchRepository.java    | 36 +++----------------
 7 files changed, 5 insertions(+), 55 deletions(-)

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 e9af37b05d..0648f609c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -69,12 +69,7 @@ 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);
-      }
+      public boolean onQueryTextChange(String newText) { return onQueryTextSubmit(newText); }
     });
 
     searchItem.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
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 401901607a..8c566c060b 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
@@ -2066,11 +2066,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     }
 
     fun onSearchQueryUpdated(query: String) {
-        Log.d("[ACL]", "1")
         searchViewModel.onQueryUpdated(query, viewModel.threadId)
-        Log.d("[ACL]", "2")
         binding?.searchBottomBar?.showLoading()
-        Log.d("[ACL]", "3")
         adapter.onSearchQueryUpdated(query)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 1ac7419d9a..160388865b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -269,9 +269,7 @@ class ConversationAdapter(
     }
 
     fun onSearchQueryUpdated(query: String?) {
-        Log.d("[ACL]", "4")
         this.searchQuery = query
-        Log.d("[ACL]", "5")
         notifyDataSetChanged()
     }
 
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 744dc579a6..989bea39be 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
@@ -125,10 +125,6 @@ object ConversationMenuHelper {
             }
 
             override fun onQueryTextChange(query: String): Boolean {
-
-                // *** Crashes when searching for non-alphanumeric first char ***
-                Log.d("[ACL]", "[ConversationMenuHelper] Query text changed to: $query")
-
                 context.onSearchQueryUpdated(query)
                 return true
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
index 92b0bed9a0..93c163f632 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
@@ -116,11 +116,7 @@ public class SearchDatabase extends Database {
   public Cursor queryMessages(@NonNull String query) {
     SQLiteDatabase db          = databaseHelper.getReadableDatabase();
     String         prefixQuery = adjustQuery(query);
-
     int queryLimit = Math.min(query.length()*50,500);
-
-    Log.d("[ACL]", "[SearchDatabase] Query is:\n" + MESSAGES_QUERY);
-
     Cursor cursor = db.rawQuery(MESSAGES_QUERY, new String[] { prefixQuery, prefixQuery, String.valueOf(queryLimit) });
     setNotifyConverationListListeners(cursor);
     return cursor;
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 d0713860f2..ecb8ee60c6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -293,10 +293,6 @@ 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)
                 }
             }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index 737322d2cb..3641b39c62 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -124,28 +124,15 @@ public class SearchRepository {
 
   public void query(@NonNull String query, long threadId, @NonNull Callback<CursorList<MessageResult>> callback) {
     if (TextUtils.isEmpty(query)) {
-      Log.d("[ACL]", "Recognised empty query!");
-
       callback.onResult(CursorList.emptyList());
       return;
     }
-    else {
-      Log.d("[ACL]", "Non-empty query is: " + query);
-    }
 
     executor.execute(() -> {
-
-      Log.d("[ACL]", "Hit query.execute!");
-
-      // If the search is for a single character and it was stripped by `sanitizeQuery` then abort
-      // the search for an empty string to avoid SQLite error.
+      // If the sanitized search query is empty or just contains a single space (" ") then abort
+      // the search to prevent SQLite errors.
       String cleanQuery = sanitizeQuery(query);
-      Log.d("[ACL]", "clean query is: \"" + cleanQuery + "\"");
-      if (cleanQuery.isEmpty() || cleanQuery.equalsIgnoreCase(" "))
-      {
-        Log.d("[ACL]", "Aborting empty search query.");
-        return;
-      }
+      if (cleanQuery.equalsIgnoreCase(" ") || cleanQuery.isEmpty()) { return; }
 
       CursorList<MessageResult> messages = queryMessages(cleanQuery, threadId);
       callback.onResult(messages);
@@ -211,19 +198,12 @@ public class SearchRepository {
   }
 
   private CursorList<MessageResult> queryMessages(@NonNull String query) {
-
-    Log.d("[ACL]", "[SearchRepository] Query is:\n" + query);
-
-
     Cursor messages = searchDatabase.queryMessages(query);
     return messages != null ? new CursorList<>(messages, new MessageModelBuilder(context))
                             : CursorList.emptyList();
   }
 
   private CursorList<MessageResult> queryMessages(@NonNull String query, long threadId) {
-
-    Log.d("[ACL]", "[SearchRepository] 6 - query is: " + query);
-
     Cursor messages = searchDatabase.queryMessages(query, threadId);
     return messages != null ? new CursorList<>(messages, new MessageModelBuilder(context))
                             : CursorList.emptyList();
@@ -237,11 +217,7 @@ public class SearchRepository {
    * However, if we replace the apostrophe with a space, then the query will find the match.
    */
   private String sanitizeQuery(@NonNull String query) {
-
-    Log.d("[ACL]", "[SearchRepository] Hit sanitizeQuery - initial query is: " + query);
-
     StringBuilder out = new StringBuilder();
-
     for (int i = 0; i < query.length(); i++) {
       char c = query.charAt(i);
       if (!BANNED_CHARACTERS.contains(c)) {
@@ -250,11 +226,7 @@ public class SearchRepository {
         out.append(' ');
       }
     }
-
-    Log.d("[ACL]", "[SearchRepository] Hit sanitizeQuery - sanitized query is: " + out.toString());
-
-    // Querying for an empty string causes a crash so we'll que
-    if (out.toString().length() > 0) { return out.toString(); } else { return " "; }
+    return out.toString();
   }
 
   private static class ContactModelBuilder implements CursorList.ModelBuilder<Contact> {

From 42e58c477bd0f81feb4272105412dce431aa5ed4 Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Wed, 17 Jan 2024 13:00:30 +1100
Subject: [PATCH 10/46] Removed unused logging imports

---
 .../org/thoughtcrime/securesms/components/SearchToolbar.java    | 2 --
 .../securesms/conversation/v2/ConversationAdapter.kt            | 1 -
 .../securesms/conversation/v2/menus/ConversationMenuHelper.kt   | 1 -
 .../org/thoughtcrime/securesms/database/SearchDatabase.java     | 2 +-
 4 files changed, 1 insertion(+), 5 deletions(-)

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 0648f609c6..9032b26a2b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.components;
 
-
 import android.animation.Animator;
 import android.content.Context;
 import android.os.Build;
@@ -16,7 +15,6 @@ 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;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
index 160388865b..6013af5ba4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
@@ -22,7 +22,6 @@ import kotlinx.coroutines.launch
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ViewVisibleMessageBinding
 import org.session.libsession.messaging.contacts.Contact
-import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.conversation.v2.messages.ControlMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageView
 import org.thoughtcrime.securesms.conversation.v2.messages.VisibleMessageViewDelegate
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 989bea39be..02ee4ae45f 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,7 +29,6 @@ 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
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
index 93c163f632..31564668a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SearchDatabase.java
@@ -10,7 +10,7 @@ import com.annimon.stream.Stream;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.session.libsession.utilities.Util;
-import org.session.libsignal.utilities.Log;
+
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
 import java.util.List;

From cab1ffec1e297163c68ac690b818cb0d6f531e8c Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Wed, 17 Jan 2024 13:01:55 +1100
Subject: [PATCH 11/46] Put back some whitespace

---
 .../org/thoughtcrime/securesms/search/SearchRepository.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index 3641b39c62..cfd620542c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -218,6 +218,7 @@ public class SearchRepository {
    */
   private String sanitizeQuery(@NonNull String query) {
     StringBuilder out = new StringBuilder();
+
     for (int i = 0; i < query.length(); i++) {
       char c = query.charAt(i);
       if (!BANNED_CHARACTERS.contains(c)) {
@@ -226,6 +227,7 @@ public class SearchRepository {
         out.append(' ');
       }
     }
+    
     return out.toString();
   }
 

From b21cdab0e404152022e86585f6077c7e8890d192 Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Fri, 1 Mar 2024 11:56:33 +1100
Subject: [PATCH 12/46] Minor cleanup

---
 .../thoughtcrime/securesms/search/SearchRepository.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index cfd620542c..a5669aa351 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -129,11 +129,10 @@ public class SearchRepository {
     }
 
     executor.execute(() -> {
-      // If the sanitized search query is empty or just contains a single space (" ") then abort
-      // the search to prevent SQLite errors.
-      String cleanQuery = sanitizeQuery(query);
-      if (cleanQuery.equalsIgnoreCase(" ") || cleanQuery.isEmpty()) { return; }
-
+      // If the sanitized search query is empty then abort the search to prevent SQLite errors.
+      String cleanQuery = sanitizeQuery(query).trim();
+      if (cleanQuery.isEmpty()) { return; }
+            
       CursorList<MessageResult> messages = queryMessages(cleanQuery, threadId);
       callback.onResult(messages);
     });

From d65705c845cad9774b2c6d55f4fe0682077ac0a1 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 4 Apr 2024 10:15:15 +1100
Subject: [PATCH 13/46] Push before cleanup

---
 .../home/search/GlobalSearchViewModel.kt      | 15 +++++--
 .../securesms/search/SearchRepository.java    | 40 +++++++++++++------
 .../securesms/util/Stopwatch.java             |  6 ++-
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
index 8908554b03..712e8819d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.plus
+import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.SettableFuture
 import org.thoughtcrime.securesms.search.SearchRepository
 import org.thoughtcrime.securesms.search.model.SearchResult
@@ -31,6 +32,9 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
 
     private val _queryText: MutableStateFlow<CharSequence> = MutableStateFlow("")
 
+    private var settableFuture = SettableFuture<SearchResult>()
+
+
     fun postQuery(charSequence: CharSequence?) {
         charSequence ?: return
         _queryText.value = charSequence
@@ -41,6 +45,7 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
         _queryText
                 .buffer(onBufferOverflow = BufferOverflow.DROP_OLDEST)
                 .mapLatest { query ->
+                    // Minimum search term is 2 characters - for a single char we do nothing
                     if (query.trim().length < 2) {
                         SearchResult.EMPTY
                     } else {
@@ -48,7 +53,13 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
                         // this coroutine will be cancelled and expensive query will not be run if typing quickly
                         // first query of 2 characters will be instant however
                         delay(300)
-                        val settableFuture = SettableFuture<SearchResult>()
+
+                        // If we already have a search running then stop it
+                        if (!settableFuture.isDone) {
+                            Log.w("[ACL]", "Cancelling settable future..")
+                            settableFuture.cancel(true); }
+
+                        settableFuture = SettableFuture<SearchResult>()
                         searchRepository.query(query.toString(), settableFuture::set)
                         try {
                             // search repository doesn't play nicely with suspend functions (yet)
@@ -64,6 +75,4 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
                 }
                 .launchIn(executor)
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index a5669aa351..ba4535e1ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -86,7 +86,15 @@ public class SearchRepository {
   }
 
   public void query(@NonNull String query, @NonNull Callback<SearchResult> callback) {
-    if (TextUtils.isEmpty(query)) {
+
+    Log.w("[ACL]", "Hit SearchRepository.query - query string is: \"" + query + "\"");
+
+    String cleanQuery = sanitizeQuery(query).trim();
+    Log.w("[ACL]", "When sanitized and trimmed this is: \"" + cleanQuery + "\"");
+
+    // If the sanitized search is empty or is less than 2 chars then abort
+    if (cleanQuery.isEmpty() || cleanQuery.length() < 2) {
+      Log.w("[ACL]", "Trimmed query is empty or less than 2 chars so returning empty SearchResult");
       callback.onResult(SearchResult.EMPTY);
       return;
     }
@@ -94,25 +102,36 @@ public class SearchRepository {
     executor.execute(() -> {
       Stopwatch timer = new Stopwatch("FtsQuery");
 
-      String cleanQuery = sanitizeQuery(query);
+      // ACL
+      //String cleanQuery = sanitizeQuery(query).trim();
 
-      // If the search is for a single character and it was stripped by `sanitizeQuery` then abort
-      // the search for an empty string to avoid SQLite error.
-      if (cleanQuery.length() == 0)
+
+      /*
+      if (cleanQuery.isEmpty())
       {
+        Log.w("[ACL]", "Aborting empty search query.");
         Log.d(TAG, "Aborting empty search query.");
         timer.stop(TAG);
         return;
       }
+      else {
+        Log.w("[ACL]", "Clean query is non-empty and is: \"" + cleanQuery + "\"");
+      }
+      */
+
 
       timer.split("clean");
 
+      Log.w("[ACL]", "About to query contacts.");
       Pair<CursorList<Contact>, List<String>> contacts = queryContacts(cleanQuery);
       timer.split("contacts");
 
+
+      Log.w("[ACL]", "About to query conversations.");
       CursorList<GroupRecord> conversations = queryConversations(cleanQuery, contacts.getSecond());
       timer.split("conversations");
 
+      Log.w("[ACL]", "About to query messages.");
       CursorList<MessageResult> messages = queryMessages(cleanQuery);
       timer.split("messages");
 
@@ -123,23 +142,20 @@ public class SearchRepository {
   }
 
   public void query(@NonNull String query, long threadId, @NonNull Callback<CursorList<MessageResult>> callback) {
-    if (TextUtils.isEmpty(query)) {
+    // If the sanitized search query is empty or less than 2 chars then abort the search
+    String cleanQuery = sanitizeQuery(query).trim();
+    if (cleanQuery.isEmpty() || cleanQuery.length() < 2) {
       callback.onResult(CursorList.emptyList());
       return;
     }
 
     executor.execute(() -> {
-      // If the sanitized search query is empty then abort the search to prevent SQLite errors.
-      String cleanQuery = sanitizeQuery(query).trim();
-      if (cleanQuery.isEmpty()) { return; }
-            
       CursorList<MessageResult> messages = queryMessages(cleanQuery, threadId);
       callback.onResult(messages);
     });
   }
 
   private Pair<CursorList<Contact>, List<String>> queryContacts(String query) {
-
     Cursor contacts = contactDatabase.queryContactsByName(query);
     List<Address> contactList = new ArrayList<>();
     List<String> contactStrings = new ArrayList<>();
@@ -189,9 +205,7 @@ public class SearchRepository {
       membersGroupList.close();
     }
 
-
     Cursor conversations = threadDatabase.getFilteredConversationList(new ArrayList<>(addresses));
-
     return conversations != null ? new CursorList<>(conversations, new GroupModelBuilder(threadDatabase, groupDatabase))
             : CursorList.emptyList();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
index cac53899fb..75bc760c31 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
@@ -37,13 +37,15 @@ public class Stopwatch {
       for (int i = 1; i < splits.size(); i++) {
         out.append(splits.get(i).label).append(": ");
         out.append(splits.get(i).time - splits.get(i - 1).time);
-        out.append("  ");
+        out.append("ms  ");
       }
 
-      out.append("total: ").append(splits.get(splits.size() - 1).time - startTime);
+      out.append("total: ").append(splits.get(splits.size() - 1).time - startTime).append("ms.");
     }
 
     Log.d(tag, out.toString());
+
+    Log.w("[ACL]", out.toString());
   }
 
   private static class Split {

From 04fb2967871c4d4d74ec5bb51cc29275d1ec105e Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 4 Apr 2024 11:27:47 +1100
Subject: [PATCH 14/46] Fixes #1346 - properly this time!

---
 .../securesms/home/HomeActivity.kt            |  9 +++
 .../home/search/GlobalSearchViewModel.kt      | 17 +++--
 .../securesms/search/SearchRepository.java    | 73 ++++---------------
 .../securesms/util/Stopwatch.java             |  4 -
 4 files changed, 32 insertions(+), 71 deletions(-)

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 917fc13fcf..ebb5a90da2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -12,6 +12,7 @@ import android.os.Build
 import android.os.Bundle
 import android.text.SpannableString
 import android.widget.Toast
+
 import androidx.activity.viewModels
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -21,20 +22,25 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+
 import dagger.hilt.android.AndroidEntryPoint
+
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ActivityHomeBinding
 import network.loki.messenger.databinding.ViewMessageRequestBannerBinding
 import network.loki.messenger.libsession_util.ConfigBase
+
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.sending_receiving.MessageSender
@@ -47,6 +53,7 @@ import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsignal.utilities.toHexString
+
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.start.NewConversationFragment
@@ -82,8 +89,10 @@ import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.push
 import org.thoughtcrime.securesms.util.show
 import org.thoughtcrime.securesms.util.themeState
+
 import java.io.IOException
 import java.util.Locale
+
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
index 712e8819d1..4a917fd291 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
@@ -2,7 +2,9 @@ package org.thoughtcrime.securesms.home.search
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+
 import dagger.hilt.android.lifecycle.HiltViewModel
+
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.delay
@@ -13,11 +15,14 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.plus
-import org.session.libsignal.utilities.Log
+
 import org.session.libsignal.utilities.SettableFuture
+
 import org.thoughtcrime.securesms.search.SearchRepository
 import org.thoughtcrime.securesms.search.model.SearchResult
+
 import java.util.concurrent.TimeUnit
+
 import javax.inject.Inject
 
 @HiltViewModel
@@ -25,8 +30,7 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
 
     private val executor = viewModelScope + SupervisorJob()
 
-    private val _result: MutableStateFlow<GlobalSearchResult> =
-            MutableStateFlow(GlobalSearchResult.EMPTY)
+    private val _result: MutableStateFlow<GlobalSearchResult> = MutableStateFlow(GlobalSearchResult.EMPTY)
 
     val result: StateFlow<GlobalSearchResult> = _result
 
@@ -34,7 +38,6 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
 
     private var settableFuture = SettableFuture<SearchResult>()
 
-
     fun postQuery(charSequence: CharSequence?) {
         charSequence ?: return
         _queryText.value = charSequence
@@ -45,7 +48,7 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
         _queryText
                 .buffer(onBufferOverflow = BufferOverflow.DROP_OLDEST)
                 .mapLatest { query ->
-                    // Minimum search term is 2 characters - for a single char we do nothing
+                    // Minimum search term is 2 characters
                     if (query.trim().length < 2) {
                         SearchResult.EMPTY
                     } else {
@@ -55,9 +58,7 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
                         delay(300)
 
                         // If we already have a search running then stop it
-                        if (!settableFuture.isDone) {
-                            Log.w("[ACL]", "Cancelling settable future..")
-                            settableFuture.cancel(true); }
+                        if (!settableFuture.isDone) { settableFuture.cancel(true) }
 
                         settableFuture = SettableFuture<SearchResult>()
                         searchRepository.query(query.toString(), settableFuture::set)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index ba4535e1ac..11ce07d06a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.MergeCursor;
-import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
@@ -36,28 +35,18 @@ import java.util.concurrent.Executor;
 
 import kotlin.Pair;
 
-/**
- * Manages data retrieval for search.
- */
+// Class to manage data retrieval for search
 public class SearchRepository {
-
   private static final String TAG = SearchRepository.class.getSimpleName();
 
   private static final Set<Character> BANNED_CHARACTERS = new HashSet<>();
   static {
-    // Several ranges of invalid ASCII characters
-    for (int i = 33; i <= 47; i++) {
-      BANNED_CHARACTERS.add((char) i);
-    }
-    for (int i = 58; i <= 64; i++) {
-      BANNED_CHARACTERS.add((char) i);
-    }
-    for (int i = 91; i <= 96; i++) {
-      BANNED_CHARACTERS.add((char) i);
-    }
-    for (int i = 123; i <= 126; i++) {
-      BANNED_CHARACTERS.add((char) i);
-    }
+    // Construct a list containing several ranges of invalid ASCII characters
+    // See: https://www.ascii-code.com/
+    for (int i = 33; i <= 47; i++)   { BANNED_CHARACTERS.add((char) i); } // !, ", #, $, %, &, ', (, ), *, +, ,, -, ., /
+    for (int i = 58; i <= 64; i++)   { BANNED_CHARACTERS.add((char) i); } // :, ;, <, =, >, ?, @
+    for (int i = 91; i <= 96; i++)   { BANNED_CHARACTERS.add((char) i); } // [, \, ], ^, _, `
+    for (int i = 123; i <= 126; i++) { BANNED_CHARACTERS.add((char) i); } // {, |, }, ~
   }
 
   private final Context                context;
@@ -86,54 +75,25 @@ public class SearchRepository {
   }
 
   public void query(@NonNull String query, @NonNull Callback<SearchResult> callback) {
-
-    Log.w("[ACL]", "Hit SearchRepository.query - query string is: \"" + query + "\"");
-
-    String cleanQuery = sanitizeQuery(query).trim();
-    Log.w("[ACL]", "When sanitized and trimmed this is: \"" + cleanQuery + "\"");
-
     // If the sanitized search is empty or is less than 2 chars then abort
+    String cleanQuery = sanitizeQuery(query).trim();
     if (cleanQuery.isEmpty() || cleanQuery.length() < 2) {
-      Log.w("[ACL]", "Trimmed query is empty or less than 2 chars so returning empty SearchResult");
       callback.onResult(SearchResult.EMPTY);
       return;
     }
 
     executor.execute(() -> {
       Stopwatch timer = new Stopwatch("FtsQuery");
-
-      // ACL
-      //String cleanQuery = sanitizeQuery(query).trim();
-
-
-      /*
-      if (cleanQuery.isEmpty())
-      {
-        Log.w("[ACL]", "Aborting empty search query.");
-        Log.d(TAG, "Aborting empty search query.");
-        timer.stop(TAG);
-        return;
-      }
-      else {
-        Log.w("[ACL]", "Clean query is non-empty and is: \"" + cleanQuery + "\"");
-      }
-      */
-
-
       timer.split("clean");
 
-      Log.w("[ACL]", "About to query contacts.");
       Pair<CursorList<Contact>, List<String>> contacts = queryContacts(cleanQuery);
-      timer.split("contacts");
+      timer.split("Contacts");
 
-
-      Log.w("[ACL]", "About to query conversations.");
       CursorList<GroupRecord> conversations = queryConversations(cleanQuery, contacts.getSecond());
-      timer.split("conversations");
+      timer.split("Conversations");
 
-      Log.w("[ACL]", "About to query messages.");
       CursorList<MessageResult> messages = queryMessages(cleanQuery);
-      timer.split("messages");
+      timer.split("Messages");
 
       timer.stop(TAG);
 
@@ -182,11 +142,10 @@ public class SearchRepository {
     MergeCursor merged = new MergeCursor(new Cursor[]{addressThreads, individualRecipients});
 
     return new Pair<>(new CursorList<>(merged, new ContactModelBuilder(contactDatabase, threadDatabase)), contactStrings);
-
   }
 
   private CursorList<GroupRecord> queryConversations(@NonNull String query, List<String> matchingAddresses) {
-    List<String>  numbers   = contactAccessor.getNumbersForThreadSearchFilter(context, query);
+    List<String> numbers = contactAccessor.getNumbersForThreadSearchFilter(context, query);
     String localUserNumber = TextSecurePreferences.getLocalNumber(context);
     if (localUserNumber != null) {
       matchingAddresses.remove(localUserNumber);
@@ -270,9 +229,7 @@ public class SearchRepository {
 
     private final Context context;
 
-    RecipientModelBuilder(@NonNull Context context) {
-      this.context = context;
-    }
+    RecipientModelBuilder(@NonNull Context context) { this.context = context; }
 
     @Override
     public Recipient build(@NonNull Cursor cursor) {
@@ -315,9 +272,7 @@ public class SearchRepository {
 
     private final Context context;
 
-    MessageModelBuilder(@NonNull Context context) {
-      this.context = context;
-    }
+    MessageModelBuilder(@NonNull Context context) { this.context = context; }
 
     @Override
     public MessageResult build(@NonNull Cursor cursor) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
index 75bc760c31..d92fc7546d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java
@@ -39,13 +39,9 @@ public class Stopwatch {
         out.append(splits.get(i).time - splits.get(i - 1).time);
         out.append("ms  ");
       }
-
       out.append("total: ").append(splits.get(splits.size() - 1).time - startTime).append("ms.");
     }
-
     Log.d(tag, out.toString());
-
-    Log.w("[ACL]", out.toString());
   }
 
   private static class Split {

From f6d21534e0e06ba8ac993ce811bb28b788cb380a Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 4 Apr 2024 13:34:08 +1100
Subject: [PATCH 15/46] Addressed PR feedback

---
 .../thoughtcrime/securesms/home/HomeActivity.kt  |  9 ---------
 .../home/search/GlobalSearchInputLayout.kt       |  4 ++++
 .../home/search/GlobalSearchViewModel.kt         | 16 +++++-----------
 .../securesms/search/SearchRepository.java       | 13 ++++---------
 4 files changed, 13 insertions(+), 29 deletions(-)

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 5be0d275df..ccfa16beef 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -12,7 +12,6 @@ import android.os.Build
 import android.os.Bundle
 import android.text.SpannableString
 import android.widget.Toast
-
 import androidx.activity.viewModels
 import androidx.core.os.bundleOf
 import androidx.core.view.isVisible
@@ -22,25 +21,20 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-
 import dagger.hilt.android.AndroidEntryPoint
-
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-
 import network.loki.messenger.R
 import network.loki.messenger.databinding.ActivityHomeBinding
 import network.loki.messenger.databinding.ViewMessageRequestBannerBinding
 import network.loki.messenger.libsession_util.ConfigBase
-
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.sending_receiving.MessageSender
@@ -53,7 +47,6 @@ import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.ThreadUtils
 import org.session.libsignal.utilities.toHexString
-
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.conversation.start.NewConversationFragment
@@ -89,10 +82,8 @@ import org.thoughtcrime.securesms.util.disableClipping
 import org.thoughtcrime.securesms.util.push
 import org.thoughtcrime.securesms.util.show
 import org.thoughtcrime.securesms.util.themeState
-
 import java.io.IOException
 import java.util.Locale
-
 import javax.inject.Inject
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
index 1537769cdc..c70979f852 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.home.search
 
 import android.content.Context
 import android.text.Editable
+import android.text.InputFilter
+import android.text.InputFilter.LengthFilter
 import android.text.TextWatcher
 import android.util.AttributeSet
 import android.view.KeyEvent
@@ -15,6 +17,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import network.loki.messenger.databinding.ViewGlobalSearchInputBinding
 
+
 class GlobalSearchInputLayout @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null
 ) : LinearLayout(context, attrs),
@@ -34,6 +37,7 @@ class GlobalSearchInputLayout @JvmOverloads constructor(
         binding.searchInput.onFocusChangeListener = this
         binding.searchInput.addTextChangedListener(this)
         binding.searchInput.setOnEditorActionListener(this)
+        binding.searchInput.setFilters( arrayOf<InputFilter>(LengthFilter(100)) ) // 100 char search limit
         binding.searchCancel.setOnClickListener(this)
         binding.searchClear.setOnClickListener(this)
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
index 4a917fd291..4232754c4e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
@@ -36,8 +36,6 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
 
     private val _queryText: MutableStateFlow<CharSequence> = MutableStateFlow("")
 
-    private var settableFuture = SettableFuture<SearchResult>()
-
     fun postQuery(charSequence: CharSequence?) {
         charSequence ?: return
         _queryText.value = charSequence
@@ -48,19 +46,15 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
         _queryText
                 .buffer(onBufferOverflow = BufferOverflow.DROP_OLDEST)
                 .mapLatest { query ->
-                    // Minimum search term is 2 characters
-                    if (query.trim().length < 2) {
+                    // Early exit on empty search query
+                    if (query.trim().isEmpty()) {
                         SearchResult.EMPTY
                     } else {
-                        // user input delay here in case we get a new query within a few hundred ms
-                        // this coroutine will be cancelled and expensive query will not be run if typing quickly
-                        // first query of 2 characters will be instant however
+                        // User input delay in case we get a new query within a few hundred ms this
+                        // coroutine will be cancelled and expensive query will not be run
                         delay(300)
 
-                        // If we already have a search running then stop it
-                        if (!settableFuture.isDone) { settableFuture.cancel(true) }
-
-                        settableFuture = SettableFuture<SearchResult>()
+                        val settableFuture = SettableFuture<SearchResult>()
                         searchRepository.query(query.toString(), settableFuture::set)
                         try {
                             // search repository doesn't play nicely with suspend functions (yet)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
index d2c51ad10f..f2adbf2349 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -4,11 +4,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.MergeCursor;
-
 import androidx.annotation.NonNull;
-
 import com.annimon.stream.Stream;
-
 import org.session.libsession.messaging.contacts.Contact;
 import org.session.libsession.utilities.Address;
 import org.session.libsession.utilities.GroupRecord;
@@ -26,13 +23,11 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.search.model.MessageResult;
 import org.thoughtcrime.securesms.search.model.SearchResult;
 import org.thoughtcrime.securesms.util.Stopwatch;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Executor;
-
 import kotlin.Pair;
 
 // Class to manage data retrieval for search
@@ -75,9 +70,9 @@ public class SearchRepository {
   }
 
   public void query(@NonNull String query, @NonNull Callback<SearchResult> callback) {
-    // If the sanitized search is empty or is less than 2 chars then abort without search
+    // If the sanitized search is empty then abort without search
     String cleanQuery = sanitizeQuery(query).trim();
-    if (cleanQuery.isEmpty() || cleanQuery.length() < 2) {
+    if (cleanQuery.isEmpty()) {
       callback.onResult(SearchResult.EMPTY);
       return;
     }
@@ -102,9 +97,9 @@ public class SearchRepository {
   }
 
   public void query(@NonNull String query, long threadId, @NonNull Callback<CursorList<MessageResult>> callback) {
-    // If the sanitized search query is empty or less than 2 chars then abort the search
+    // If the sanitized search query is empty then abort the search
     String cleanQuery = sanitizeQuery(query).trim();
-    if (cleanQuery.isEmpty() || cleanQuery.length() < 2) {
+    if (cleanQuery.isEmpty()) {
       callback.onResult(CursorList.emptyList());
       return;
     }

From 0146a2975f7c85eb37aeed64fc8ead2a6b41f3ce Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 4 Apr 2024 13:36:14 +1100
Subject: [PATCH 16/46] Cleanup

---
 .../securesms/home/search/GlobalSearchInputLayout.kt      | 1 -
 .../securesms/home/search/GlobalSearchViewModel.kt        | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
index c70979f852..c22ccde1f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchInputLayout.kt
@@ -17,7 +17,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import network.loki.messenger.databinding.ViewGlobalSearchInputBinding
 
-
 class GlobalSearchInputLayout @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null
 ) : LinearLayout(context, attrs),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
index 4232754c4e..1ff0a395fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/search/GlobalSearchViewModel.kt
@@ -2,9 +2,7 @@ package org.thoughtcrime.securesms.home.search
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-
 import dagger.hilt.android.lifecycle.HiltViewModel
-
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.delay
@@ -15,14 +13,10 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.plus
-
 import org.session.libsignal.utilities.SettableFuture
-
 import org.thoughtcrime.securesms.search.SearchRepository
 import org.thoughtcrime.securesms.search.model.SearchResult
-
 import java.util.concurrent.TimeUnit
-
 import javax.inject.Inject
 
 @HiltViewModel
@@ -51,7 +45,7 @@ class GlobalSearchViewModel @Inject constructor(private val searchRepository: Se
                         SearchResult.EMPTY
                     } else {
                         // User input delay in case we get a new query within a few hundred ms this
-                        // coroutine will be cancelled and expensive query will not be run
+                        // coroutine will be cancelled and the expensive query will not be run.
                         delay(300)
 
                         val settableFuture = SettableFuture<SearchResult>()

From ad51746e845cbc31c16ac599cab1188bc0674b84 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Mon, 8 Apr 2024 13:53:18 +1000
Subject: [PATCH 17/46] Initial fix implemented

---
 .../conversation/v2/ConversationActivityV2.kt         | 11 ++++++-----
 .../thoughtcrime/securesms/database/MmsDatabase.kt    |  3 +--
 .../thoughtcrime/securesms/database/SmsDatabase.java  |  1 +
 .../securesms/database/ThreadDatabase.java            |  6 ++++--
 4 files changed, 12 insertions(+), 9 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 00e72562d5..a9aab2d779 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
@@ -1112,6 +1112,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         val blindedRecipient = viewModel.blindedRecipient
         val binding = binding ?: return
         val openGroup = viewModel.openGroup
+
         val (textResource, insertParam) = when {
             recipient.isLocalNumber -> R.string.activity_conversation_empty_state_note_to_self to null
             openGroup != null && !openGroup.canWrite -> R.string.activity_conversation_empty_state_read_only to recipient.toShortString()
@@ -1883,11 +1884,13 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             return
         }
 
+
+
         val allSentByCurrentUser = messages.all { it.isOutgoing }
         val allHasHash = messages.all { lokiMessageDb.getMessageServerHash(it.id, it.isMms) != null }
 
-        // If the recipient is a community then we delete the message for everyone
-        if (recipient.isCommunityRecipient) {
+        // If the recipient is a community OR a Note-to-Self then we delete the message for everyone
+        if (recipient.isCommunityRecipient || recipient.isLocalNumber) {
             val messageCount = 1 // Only used for plurals string
             showSessionDialog {
                 title(resources.getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messageCount, messageCount))
@@ -1917,8 +1920,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             }
             bottomSheet.show(supportFragmentManager, bottomSheet.tag)
         }
-        else // Finally, if this is a closed group and you are deleting someone else's message(s)
-        // then we can only delete locally.
+        else // Finally, if this is a closed group and you are deleting someone else's message(s) then we can only delete locally.
         {
             val messageCount = 1
             showSessionDialog {
@@ -2027,7 +2029,6 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         val message = messages.first() as MmsMessageRecord
 
         // Do not allow the user to download a file attachment before it has finished downloading
-        // TODO: Localise the msg in this toast!
         if (message.isMediaPending) {
             Toast.makeText(this, resources.getString(R.string.conversation_activity__wait_until_attachment_has_finished_downloading), Toast.LENGTH_LONG).show()
             return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
index 0f39e3a496..f2fcefd0aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt
@@ -1095,8 +1095,7 @@ class MmsDatabase(context: Context, databaseHelper: SQLCipherOpenHelper) : Messa
         }
         val whereString = where.substring(0, where.length - 4)
         try {
-            cursor =
-                db!!.query(TABLE_NAME, arrayOf<String?>(ID), whereString, null, null, null, null)
+            cursor = db!!.query(TABLE_NAME, arrayOf<String?>(ID), whereString, null, null, null, null)
             val toDeleteStringMessageIds = mutableListOf<String>()
             while (cursor.moveToNext()) {
                 toDeleteStringMessageIds += cursor.getLong(0).toString()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 61f17a2d86..450e7c2d23 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -633,6 +633,7 @@ public class SmsDatabase extends MessagingDatabase {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     long threadId = getThreadIdForMessage(messageId);
     db.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
+    notifyConversationListeners(threadId);
     boolean threadDeleted = DatabaseComponent.get(context).threadDatabase().update(threadId, false, true);
     return threadDeleted;
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index e2f9687451..5f71ce9330 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -515,11 +515,13 @@ public class ThreadDatabase extends Database {
     return getConversationList(where);
   }
 
+  /*
   public Cursor getArchivedConversationList() {
     String where  = "(" + MESSAGE_COUNT + " != 0 OR " + GroupDatabase.TABLE_NAME + "." + GROUP_ID + " LIKE '" + COMMUNITY_PREFIX + "%') " +
             "AND " + ARCHIVED + " = 1 ";
     return getConversationList(where);
   }
+  */
 
   private Cursor getConversationList(String where) {
     SQLiteDatabase db     = databaseHelper.getReadableDatabase();
@@ -771,11 +773,11 @@ public class ThreadDatabase extends Database {
           deleteThread(threadId);
           return true;
         }
+        // todo: add empty snippet that clears existing data
         return false;
       }
     } finally {
-      if (reader != null)
-        reader.close();
+      if (reader != null) { reader.close(); }
       notifyConversationListListeners();
       notifyConversationListeners(threadId);
     }

From dce0fd841303940943b8c675011d958ef46185e7 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Mon, 8 Apr 2024 14:08:40 +1000
Subject: [PATCH 18/46] Fixes #1448

---
 .../securesms/conversation/v2/ConversationActivityV2.kt       | 4 +---
 1 file changed, 1 insertion(+), 3 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 a9aab2d779..7b9c3629f9 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
@@ -1883,9 +1883,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             Log.w("ConversationActivityV2", "Asked to delete messages but could not obtain viewModel recipient - aborting.")
             return
         }
-
-
-
+        
         val allSentByCurrentUser = messages.all { it.isOutgoing }
         val allHasHash = messages.all { lokiMessageDb.getMessageServerHash(it.id, it.isMms) != null }
 

From 0ab0ecbb553cf3e31b725a4c9d68b751cef0dbd7 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Mon, 8 Apr 2024 15:23:00 +1000
Subject: [PATCH 19/46] Addressed PR feedback

---
 .../securesms/database/ThreadDatabase.java         | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 5f71ce9330..507088a0ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -515,14 +515,6 @@ public class ThreadDatabase extends Database {
     return getConversationList(where);
   }
 
-  /*
-  public Cursor getArchivedConversationList() {
-    String where  = "(" + MESSAGE_COUNT + " != 0 OR " + GroupDatabase.TABLE_NAME + "." + GROUP_ID + " LIKE '" + COMMUNITY_PREFIX + "%') " +
-            "AND " + ARCHIVED + " = 1 ";
-    return getConversationList(where);
-  }
-  */
-
   private Cursor getConversationList(String where) {
     SQLiteDatabase db     = databaseHelper.getReadableDatabase();
     String         query  = createQuery(where, 0);
@@ -752,10 +744,7 @@ public class ThreadDatabase extends Database {
       return true;
     }
 
-    MmsSmsDatabase.Reader reader = null;
-
-    try {
-      reader = mmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId));
+    try (MmsSmsDatabase.Reader reader = mmsSmsDatabase.readerFor(mmsSmsDatabase.getConversationSnippet(threadId))) {
       MessageRecord record = null;
       if (reader != null) {
         record = reader.getNext();
@@ -777,7 +766,6 @@ public class ThreadDatabase extends Database {
         return false;
       }
     } finally {
-      if (reader != null) { reader.close(); }
       notifyConversationListListeners();
       notifyConversationListeners(threadId);
     }

From 35d176c71e3ed6b0df3d98ca1369923e26b52773 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 9 Apr 2024 12:36:11 +0930
Subject: [PATCH 20/46] Handle case where there are no messages

---
 .../thoughtcrime/securesms/database/MmsSmsDatabase.java    | 7 +++++--
 .../thoughtcrime/securesms/database/ThreadDatabase.java    | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index be66d84db2..da4f39f0c1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -325,9 +325,12 @@ public class MmsSmsDatabase extends Database {
     String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
 
     try (Cursor cursor = queryTables(PROJECTION, selection, order, "1")) {
-      cursor.moveToFirst();
-      return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_SENT));
+      if (cursor.moveToFirst()) {
+        return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_SENT));
+      }
     }
+
+    return -1;
   }
 
   public Cursor getUnread() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index b7adab9320..ef3937d4d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -939,7 +939,9 @@ public class ThreadDatabase extends Database {
       if (count > 0) {
         MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
         long messageTimestamp = mmsSmsDatabase.getLastMessageTimestamp(threadId);
-        lastMessage = mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
+        if (messageTimestamp > 0) {
+          lastMessage = mmsSmsDatabase.getMessageForTimestamp(messageTimestamp);
+        }
       }
 
       return new ThreadRecord(body, snippetUri, lastMessage, recipient, date, count,

From 1d9ac6ac10ed36b0c447073185770584e8691a4e Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Wed, 10 Apr 2024 15:31:33 +1000
Subject: [PATCH 21/46] build: update build number

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e63207bf9..9e231c1bec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ configurations.all {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 369
-def canonicalVersionName = "1.18.1"
+def canonicalVersionCode = 370
+def canonicalVersionName = "1.18.2"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,

From 6960d0c7049147567a45e09f4c41ed44c792e003 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Fri, 12 Apr 2024 11:37:45 +0930
Subject: [PATCH 22/46] Fix spacing when title is absent

---
 .../securesms/SessionDialogBuilder.kt         | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index a99b40f36f..52c9fe760a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -7,7 +7,9 @@ import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.Button
 import android.widget.LinearLayout
+import android.widget.LinearLayout.LayoutParams
 import android.widget.LinearLayout.VERTICAL
+import android.widget.Space
 import android.widget.TextView
 import androidx.annotation.AttrRes
 import androidx.annotation.LayoutRes
@@ -15,13 +17,11 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.setMargins
-import androidx.core.view.setPadding
 import androidx.core.view.updateMargins
 import androidx.fragment.app.Fragment
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.util.toPx
 
-
 @DslMarker
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE)
 annotation class DialogDsl
@@ -37,7 +37,9 @@ class SessionDialogBuilder(val context: Context) {
     private var dialog: AlertDialog? = null
     private fun dismiss() = dialog?.dismiss()
 
-    private val topView = LinearLayout(context).apply { orientation = VERTICAL }
+    private val topView = LinearLayout(context)
+        .apply { setPadding(0, dp20, 0, 0) }
+        .apply { orientation = VERTICAL }
         .also(dialogBuilder::setCustomTitle)
     private val contentView = LinearLayout(context).apply { orientation = VERTICAL }
     private val buttonLayout = LinearLayout(context)
@@ -53,18 +55,17 @@ class SessionDialogBuilder(val context: Context) {
 
     fun title(text: CharSequence?) = title(text?.toString())
     fun title(text: String?) {
-        text(text, R.style.TextAppearance_AppCompat_Title) { setPadding(dp20) }
+        text(text, R.style.TextAppearance_AppCompat_Title) { setPadding(dp20, 0, dp20, 0) }
     }
 
     fun text(@StringRes id: Int, style: Int = 0) = text(context.getString(id), style)
     fun text(text: CharSequence?, @StyleRes style: Int = 0) {
         text(text, style) {
             layoutParams = LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
-                .apply { updateMargins(dp40, 0, dp40, dp20) }
+                .apply { updateMargins(dp40, 0, dp40, 0) }
         }
     }
 
-
     private fun text(text: CharSequence?, @StyleRes style: Int, modify: TextView.() -> Unit) {
         text ?: return
         TextView(context, null, 0, style)
@@ -73,6 +74,10 @@ class SessionDialogBuilder(val context: Context) {
                 textAlignment = View.TEXT_ALIGNMENT_CENTER
                 modify()
             }.let(topView::addView)
+
+        Space(context).apply {
+            layoutParams = LayoutParams(0, dp20)
+        }.let(topView::addView)
     }
 
     fun view(view: View) = contentView.addView(view)
@@ -126,7 +131,7 @@ class SessionDialogBuilder(val context: Context) {
             setText(text)
             contentDescription = resources.getString(contentDescriptionRes)
             layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT, 1f)
-                .apply { setMargins(toPx(20, resources)) }
+                .apply { setMargins(dp20) }
             setOnClickListener {
                 listener.invoke()
                 if (dismiss) dismiss()

From 22660fd49c85f3e42891d3a268a0598d7a38785c Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Fri, 12 Apr 2024 14:12:08 +0930
Subject: [PATCH 23/46] Hide reply button in MessageDetails for group
 invitations

---
 .../conversation/v2/MessageDetailActivity.kt  | 20 ++++++++++---------
 .../v2/MessageDetailsViewModel.kt             |  3 ++-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
index 61732827f3..d5e28fb936 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -123,7 +123,7 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
         AppTheme {
             MessageDetails(
                 state = state,
-                onReply = { setResultAndFinish(ON_REPLY) },
+                onReply = if (state.canReply) { { setResultAndFinish(ON_REPLY) } } else null,
                 onResend = state.error?.let { { setResultAndFinish(ON_RESEND) } },
                 onDelete = { setResultAndFinish(ON_DELETE) },
                 onClickImage = { viewModel.onClickImage(it) },
@@ -145,7 +145,7 @@ class MessageDetailActivity : PassphraseRequiredActionBarActivity() {
 @Composable
 fun MessageDetails(
     state: MessageDetailsState,
-    onReply: () -> Unit = {},
+    onReply: (() -> Unit)? = null,
     onResend: (() -> Unit)? = null,
     onDelete: () -> Unit = {},
     onClickImage: (Int) -> Unit = {},
@@ -214,18 +214,20 @@ fun CellMetadata(
 
 @Composable
 fun CellButtons(
-    onReply: () -> Unit = {},
+    onReply: (() -> Unit)? = null,
     onResend: (() -> Unit)? = null,
     onDelete: () -> Unit = {},
 ) {
     Cell {
         Column {
-            ItemButton(
-                stringResource(R.string.reply),
-                R.drawable.ic_message_details__reply,
-                onClick = onReply
-            )
-            Divider()
+            onReply?.let {
+                ItemButton(
+                    stringResource(R.string.reply),
+                    R.drawable.ic_message_details__reply,
+                    onClick = it
+                )
+                Divider()
+            }
             onResend?.let {
                 ItemButton(
                     stringResource(R.string.resend),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
index 4ebc1f27b3..ba153a6b36 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
@@ -117,7 +117,7 @@ class MessageDetailsViewModel @Inject constructor(
         Attachment(slide.details, slide.fileName.orNull(), slide.uri, slide is ImageSlide)
 
     fun onClickImage(index: Int) {
-        val state = state.value ?: return
+        val state = state.value
         val mmsRecord = state.mmsRecord ?: return
         val slide = mmsRecord.slideDeck.slides[index] ?: return
         // only open to downloaded images
@@ -158,6 +158,7 @@ data class MessageDetailsState(
     val thread: Recipient? = null,
 ) {
     val fromTitle = GetString(R.string.message_details_header__from)
+    val canReply = record?.isOpenGroupInvitation != true
 }
 
 data class Attachment(

From 2f116c13164f2150e4843fa9cd44a5f5daadfa72 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Fri, 12 Apr 2024 15:22:54 +0930
Subject: [PATCH 24/46] Remove reply from context menu for open group
 invitations

---
 .../securesms/conversation/v2/ConversationReactionOverlay.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
index d336c5fcce..af754a300a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt
@@ -532,7 +532,7 @@ class ConversationReactionOverlay : FrameLayout {
         items += ActionItem(R.attr.menu_select_icon, R.string.conversation_context__menu_select, { handleActionItemClicked(Action.SELECT) }, R.string.AccessibilityId_select)
         // Reply
         val canWrite = openGroup == null || openGroup.canWrite
-        if (canWrite && !message.isPending && !message.isFailed) {
+        if (canWrite && !message.isPending && !message.isFailed && !message.isOpenGroupInvitation) {
             items += ActionItem(R.attr.menu_reply_icon, R.string.conversation_context__menu_reply, { handleActionItemClicked(Action.REPLY) }, R.string.AccessibilityId_reply_message)
         }
         // Copy message text

From fe58ad40524f0340b23a86fdc023a49a080dc6bb Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Fri, 12 Apr 2024 15:32:04 +0930
Subject: [PATCH 25/46] Ignore swipe reply to open group invitation

---
 .../securesms/conversation/v2/ConversationActivityV2.kt          | 1 +
 1 file changed, 1 insertion(+)

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 7b9c3629f9..fc6fb03e1e 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
@@ -1251,6 +1251,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
 
     // `position` is the adapter position; not the visual position
     private fun handleSwipeToReply(message: MessageRecord) {
+        if (message.isOpenGroupInvitation) return
         val recipient = viewModel.recipient ?: return
         binding?.inputBar?.draftQuote(recipient, message, glide)
     }

From 8f69d5737404cd321fc554deddc2af4e1bc43158 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Sat, 13 Apr 2024 00:04:33 +0930
Subject: [PATCH 26/46] Fix multiple quote previews

---
 .../securesms/conversation/v2/input_bar/InputBar.kt             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index 5959c41d16..f9cbea2b1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -140,6 +140,8 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
     }
 
     fun draftQuote(thread: Recipient, message: MessageRecord, glide: GlideRequests) {
+        quoteView?.let(binding.inputBarAdditionalContentContainer::removeView)
+
         quote = message
 
         // If we already have a link preview View then clear the 'additional content' layout so that

From 9d1762eab0374901a73bce68145ab12d6c2a092a Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Sat, 13 Apr 2024 00:27:45 +0930
Subject: [PATCH 27/46] Fix message menu icons not visible in light theme

---
 .../thoughtcrime/securesms/components/menu/ContextMenuList.kt  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
index 31870e9b7a..69dec0cdd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import network.loki.messenger.R
+import org.session.libsession.utilities.getColorFromAttr
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
@@ -84,7 +85,7 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) {
         context.theme.resolveAttribute(item.iconRes, typedValue, true)
         icon.setImageDrawable(ContextCompat.getDrawable(context, typedValue.resourceId))
 
-        icon.imageTintList = color?.let(ColorStateList::valueOf)
+        icon.imageTintList = ColorStateList.valueOf(color ?: context.getColorFromAttr(android.R.attr.textColor))
       }
       item.contentDescription?.let(context.resources::getString)?.let { itemView.contentDescription = it }
       title.setText(item.title)

From 9d0fe7581c47d083fc7b5f82a6a4516a78e15975 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 16 Apr 2024 12:47:34 +0930
Subject: [PATCH 28/46] Hide reply app bar menu item for open group invite

---
 .../conversation/v2/menus/ConversationActionModeCallback.kt     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
index 2788d35dd2..21398c71aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationActionModeCallback.kt
@@ -77,7 +77,7 @@ class ConversationActionModeCallback(private val adapter: ConversationAdapter, p
             && firstMessage.isMms && (firstMessage as MediaMmsMessageRecord).containsMediaSlide())
         // Reply
         menu.findItem(R.id.menu_context_reply).isVisible =
-            (selectedItems.size == 1 && !firstMessage.isPending && !firstMessage.isFailed)
+            (selectedItems.size == 1 && !firstMessage.isPending && !firstMessage.isFailed && !firstMessage.isOpenGroupInvitation)
     }
 
     override fun onPrepareActionMode(mode: ActionMode?, menu: Menu): Boolean {

From 96510946c6f4adf58c5643916b175a274da12ba6 Mon Sep 17 00:00:00 2001
From: AL-Session <160798022+AL-Session@users.noreply.github.com>
Date: Tue, 16 Apr 2024 13:37:13 +1000
Subject: [PATCH 29/46] SES-1727 Mentions text is the wrong colour (#1454)

* Fixes #1453

* Cleanup

* Code review adjustments

* Adjusted mentions to use the accent colour as their background colour when using light themes

---------

Co-authored-by: alansley <aclansley@gmail.com>
---
 .../securesms/BaseActionBarActivity.java      |  9 ++++-
 .../v2/utilities/MentionUtilities.kt          | 40 ++++++++++++++++---
 .../securesms/util/ViewUtilities.kt           | 18 ++++++++-
 .../messaging/mentions/MentionsManager.kt     |  2 +-
 .../libsession/utilities/ThemeUtil.java       |  4 ++
 5 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
index 51f66ec323..c43d406575 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -39,15 +39,20 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   public int getDesiredTheme() {
     ThemeState themeState = ActivityUtilitiesKt.themeState(getPreferences());
     int userSelectedTheme = themeState.getTheme();
+
+    // If the user has configured Session to follow the system light/dark theme mode then do so..
     if (themeState.getFollowSystem()) {
-      // do light or dark based on the selected theme
+
+      // Use light or dark versions of the user's theme based on light-mode / dark-mode settings
       boolean isDayUi = UiModeUtilities.isDayUiMode(this);
       if (userSelectedTheme == R.style.Ocean_Dark || userSelectedTheme == R.style.Ocean_Light) {
         return isDayUi ? R.style.Ocean_Light : R.style.Ocean_Dark;
       } else {
         return isDayUi ? R.style.Classic_Light : R.style.Classic_Dark;
       }
-    } else {
+    }
+    else // ..otherwise just return their selected theme.
+    {
       return userSelectedTheme;
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
index 1ba4a0c3e5..a52d8458f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
@@ -4,18 +4,24 @@ import android.content.Context
 import android.graphics.Typeface
 import android.text.Spannable
 import android.text.SpannableString
+import android.text.style.BackgroundColorSpan
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
 import android.util.Range
+import androidx.appcompat.widget.ThemeUtils
 import androidx.core.content.res.ResourcesCompat
 import network.loki.messenger.R
 import nl.komponents.kovenant.combine.Tuple2
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.utilities.SodiumUtilities
 import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.ThemeUtil
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
 import org.thoughtcrime.securesms.util.UiModeUtilities
 import org.thoughtcrime.securesms.util.getAccentColor
+import org.thoughtcrime.securesms.util.getColorResourceIdFromAttr
+import org.thoughtcrime.securesms.util.getMessageTextColourAttr
 import java.util.regex.Pattern
 
 object MentionUtilities {
@@ -58,15 +64,37 @@ object MentionUtilities {
             }
         }
         val result = SpannableString(text)
-        val isLightMode = UiModeUtilities.isDayUiMode(context)
-        val color = if (isOutgoingMessage) {
-            ResourcesCompat.getColor(context.resources, if (isLightMode) R.color.white else R.color.black, context.theme)
-        } else {
-            context.getAccentColor()
+
+        var mentionTextColour: Int? = null
+        // In dark themes..
+        if (ThemeUtil.isDarkTheme(context)) {
+            // ..we use the standard outgoing message colour for outgoing messages..
+            if (isOutgoingMessage) {
+                val mentionTextColourAttributeId = getMessageTextColourAttr(true)
+                val mentionTextColourResourceId = getColorResourceIdFromAttr(context, mentionTextColourAttributeId)
+                mentionTextColour = ResourcesCompat.getColor(context.resources, mentionTextColourResourceId, context.theme)
+            }
+            else // ..but we use the accent colour for incoming messages (i.e., someone mentioning us)..
+            {
+                mentionTextColour = context.getAccentColor()
+            }
         }
+        else // ..while in light themes we always just use the incoming or outgoing message text colour for mentions.
+        {
+            val mentionTextColourAttributeId = getMessageTextColourAttr(isOutgoingMessage)
+            val mentionTextColourResourceId = getColorResourceIdFromAttr(context, mentionTextColourAttributeId)
+            mentionTextColour = ResourcesCompat.getColor(context.resources, mentionTextColourResourceId, context.theme)
+        }
+
         for (mention in mentions) {
-            result.setSpan(ForegroundColorSpan(color), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            result.setSpan(ForegroundColorSpan(mentionTextColour), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
             result.setSpan(StyleSpan(Typeface.BOLD), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+
+            // If we're using a light theme then we change the background colour of the mention to be the accent colour
+            if (ThemeUtil.isLightTheme(context)) {
+                val backgroundColour = context.getAccentColor();
+                result.setSpan(BackgroundColorSpan(backgroundColour), mention.first.lower, mention.first.upper, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+            }
         }
         return result
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
index dfd4ffe419..9c427e1f86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
@@ -9,12 +9,15 @@ import android.graphics.Bitmap
 import android.graphics.PointF
 import android.graphics.Rect
 import android.util.Size
+import android.util.TypedValue
 import android.view.View
 import androidx.annotation.ColorInt
 import androidx.annotation.DimenRes
 import network.loki.messenger.R
 import org.session.libsession.utilities.getColorFromAttr
 import android.view.inputmethod.InputMethodManager
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorRes
 import androidx.core.graphics.applyCanvas
 import kotlin.math.roundToInt
 
@@ -32,6 +35,20 @@ val View.hitRect: Rect
 @ColorInt
 fun Context.getAccentColor() = getColorFromAttr(R.attr.colorAccent)
 
+// Method to grab the appropriate attribute for a message colour.
+// Note: This is an attribute, NOT a resource Id - see `getColorResourceIdFromAttr` for that.
+@AttrRes
+fun getMessageTextColourAttr(messageIsOutgoing: Boolean): Int =
+    if (messageIsOutgoing) R.attr.message_sent_text_color else R.attr.message_received_text_color
+
+// Method to get an actual R.id.<SOME_COLOUR> resource Id from an attribute such as R.attr.message_sent_text_color etc.
+@ColorRes
+fun getColorResourceIdFromAttr(context: Context, attr: Int): Int {
+    val typedValue = TypedValue()
+    context.theme.resolveAttribute(attr, typedValue, true)
+    return typedValue.resourceId
+}
+
 fun View.animateSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int, animationDuration: Long = 250) {
     val startSize = resources.getDimension(startSizeID)
     val endSize = resources.getDimension(endSizeID)
@@ -70,7 +87,6 @@ fun View.hideKeyboard() {
     imm.hideSoftInputFromWindow(this.windowToken, 0)
 }
 
-
 fun View.drawToBitmap(config: Bitmap.Config = Bitmap.Config.ARGB_8888, longestWidth: Int = 2000): Bitmap {
     val size = Size(measuredWidth, measuredHeight).coerceAtMost(longestWidth)
     val scale = size.width / measuredWidth.toFloat()
diff --git a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
index fd16061e67..c3537a334a 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/mentions/MentionsManager.kt
@@ -2,7 +2,7 @@ package org.session.libsession.messaging.mentions
 
 import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.contacts.Contact
-import java.util.*
+import java.util.Locale
 
 object MentionsManager {
     var userPublicKeyCache = mutableMapOf<Long, Set<String>>() // Thread ID to set of user hex encoded public keys
diff --git a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java
index dc77aae5ac..22375b1da7 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java
+++ b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java
@@ -27,6 +27,10 @@ public class ThemeUtil {
     return getAttributeText(context, R.attr.theme_type, "light").equals("dark");
   }
 
+  public static boolean isLightTheme(@NonNull Context context) {
+    return getAttributeText(context, R.attr.theme_type, "light").equals("light");
+  }
+
   public static boolean getThemedBoolean(@NonNull Context context, @AttrRes int attr) {
     TypedValue      typedValue = new TypedValue();
     Resources.Theme theme      = context.getTheme();

From 200bf0d9918b7f643a100aea107cfcdbf0c39c60 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 16 Apr 2024 13:14:06 +0930
Subject: [PATCH 30/46] Disable swipe to reply on open group invites

---
 .../securesms/conversation/v2/messages/VisibleMessageView.kt   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index a59a102d1c..c441f1e23e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -65,6 +65,7 @@ private const val TAG = "VisibleMessageView"
 
 @AndroidEntryPoint
 class VisibleMessageView : LinearLayout {
+    private var replyDisabled: Boolean = false
     @Inject lateinit var threadDb: ThreadDatabase
     @Inject lateinit var lokiThreadDb: LokiThreadDatabase
     @Inject lateinit var lokiApiDb: LokiAPIDatabase
@@ -135,6 +136,7 @@ class VisibleMessageView : LinearLayout {
         onAttachmentNeedsDownload: (Long, Long) -> Unit,
         lastSentMessageId: Long
     ) {
+        replyDisabled = message.isOpenGroupInvitation
         val threadID = message.threadId
         val thread = threadDb.getRecipientForThreadId(threadID) ?: return
         val isGroupThread = thread.isGroupRecipient
@@ -409,6 +411,7 @@ class VisibleMessageView : LinearLayout {
         } else {
             longPressCallback?.let { gestureHandler.removeCallbacks(it) }
         }
+        if (replyDisabled) return
         if (translationX > 0) { return } // Only allow swipes to the left
         // The idea here is to asymptotically approach a maximum drag distance
         val damping = 50.0f

From 706e5766bb536ef2978c4a111cf992ce9b49095a Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Wed, 17 Apr 2024 15:35:41 +0930
Subject: [PATCH 31/46] Fix multiple link previews

---
 .../securesms/conversation/v2/input_bar/InputBar.kt             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
index 5959c41d16..10bba37405 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -178,7 +178,7 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
         // message we'll bail early if a link preview View already exists and just let
         // `updateLinkPreview` get called to update the existing View.
         if (linkPreview != null && linkPreviewDraftView != null) return
-
+        linkPreviewDraftView?.let(binding.inputBarAdditionalContentContainer::removeView)
         linkPreviewDraftView = LinkPreviewDraftView(context).also { it.delegate = this }
 
         // Add the link preview View. Note: If there's already a quote View in the 'additional

From 57d1de165e78445d2c64137ce613c8bb865b9bd5 Mon Sep 17 00:00:00 2001
From: AL-Session <160798022+AL-Session@users.noreply.github.com>
Date: Wed, 17 Apr 2024 17:25:21 +1000
Subject: [PATCH 32/46] SES1718 - Message Sending Status (#1462)

* Investigation in progress

* Initial push for PR

* Fixes #1461

* Removed leftover debug comments

* Added minor optimisation to showMessageStatus method (bail early if the message isn't one we care about displaying details of to the user)

* Minor cleanup

* Tiny cleanup

* Addressed PR feedback

* Removed forgotten debug log line & forced delivery status elements to be removed on non-visible messages just in case

* Minor refactor to simplify 'VisibleMessageView.showStatusMessage'

---------

Co-authored-by: alansley <aclansley@gmail.com>
---
 .../disappearingmessages/State.kt             |   2 +-
 .../v2/messages/VisibleMessageView.kt         | 133 +++++++++++++-----
 .../database/model/DisplayRecord.java         |   5 +
 3 files changed, 105 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt
index cc968df398..ced4cc0035 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt
@@ -68,7 +68,7 @@ enum class ExpiryType(
     AFTER_SEND(
         ExpiryMode::AfterSend,
         R.string.expiration_type_disappear_after_send,
-        R.string.expiration_type_disappear_after_read_description,
+        R.string.expiration_type_disappear_after_send_description,
         R.string.AccessibilityId_disappear_after_send_option
     );
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index a59a102d1c..f22de40c10 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -37,6 +37,7 @@ import org.session.libsession.utilities.ViewUtil
 import org.session.libsession.utilities.getColorFromAttr
 import org.session.libsession.utilities.modifyLayoutParams
 import org.session.libsignal.utilities.IdPrefix
+import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
 import org.thoughtcrime.securesms.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.database.LokiThreadDatabase
@@ -206,7 +207,7 @@ class VisibleMessageView : LinearLayout {
         binding.dateBreakTextView.text = if (showDateBreak) DateUtils.getDisplayFormattedTimeSpanString(context, Locale.getDefault(), message.timestamp) else null
         binding.dateBreakTextView.isVisible = showDateBreak
 
-        // Message status indicator
+        // Update message status indicator
         showStatusMessage(message)
 
         // Emoji Reactions
@@ -243,44 +244,101 @@ class VisibleMessageView : LinearLayout {
         onDoubleTap = { binding.messageContentView.root.onContentDoubleTap?.invoke() }
     }
 
+    // Method to display or hide the status of a message.
+    // Note: Although most commonly used to display the delivery status of a message, we also use the
+    // message status area to display the disappearing messages state - so in this latter case we'll
+    // be displaying the "Sent" and the animating clock icon for outgoing messages or "Read" and the
+    // animated clock icon for incoming messages.
     private fun showStatusMessage(message: MessageRecord) {
+        // We'll start by hiding everything and then only make visible what we need
+        binding.messageStatusTextView.isVisible  = false
+        binding.messageStatusImageView.isVisible = false
+        binding.expirationTimerView.isVisible    = false
 
-        val scheduledToDisappear = message.expiresIn > 0
+        // Get details regarding how we should display the message (it's delivery icon, icon tint colour, and
+        // the resource string for what text to display (R.string.delivery_status_sent etc.).
+        val (iconID, iconColor, textId) = getMessageStatusInfo(message)
+
+        // If we get any nulls then a message isn't one with a state that we care about (i.e., control messages
+        // etc.) - so bail. See: `DisplayRecord.is<WHATEVER>` for the full suite of message state methods.
+        // Also: We set all delivery status elements visibility to false just to make sure we don't display any
+        // stale data.
+        if (textId == null) return
 
         binding.messageInnerLayout.modifyLayoutParams<FrameLayout.LayoutParams> {
             gravity = if (message.isOutgoing) Gravity.END else Gravity.START
         }
-
         binding.statusContainer.modifyLayoutParams<ConstraintLayout.LayoutParams> {
             horizontalBias = if (message.isOutgoing) 1f else 0f
         }
 
-        binding.expirationTimerView.isGone = true
+        // If the message is incoming AND it is not scheduled to disappear then don't show any status or timer details
+        val scheduledToDisappear = message.expiresIn > 0
+        if (message.isIncoming && !scheduledToDisappear) return
 
-        if (message.isOutgoing || scheduledToDisappear) {
-            val (iconID, iconColor, textId) = getMessageStatusImage(message)
-            textId?.let(binding.messageStatusTextView::setText)
-            iconColor?.let(binding.messageStatusTextView::setTextColor)
-            iconID?.let { ContextCompat.getDrawable(context, it) }
-                ?.run { iconColor?.let { mutate().apply { setTint(it) } } ?: this }
-                ?.let(binding.messageStatusImageView::setImageDrawable)
+        // Set text & icons as appropriate for the message state. Note: Possible message states we care
+        // about are: isFailed, isSyncFailed, isPending, isSyncing, isResyncing, isRead, and isSent.
+        textId.let(binding.messageStatusTextView::setText)
+        iconColor?.let(binding.messageStatusTextView::setTextColor)
+        iconID?.let { ContextCompat.getDrawable(context, it) }
+            ?.run { iconColor?.let { mutate().apply { setTint(it) } } ?: this }
+            ?.let(binding.messageStatusImageView::setImageDrawable)
 
-            // Always show the delivery status of the last sent message
-            val thisUsersSessionId = TextSecurePreferences.getLocalNumber(context)
-            val lastSentMessageId = mmsSmsDb.getLastSentMessageFromSender(message.threadId, thisUsersSessionId)
-            val isLastSentMessage = lastSentMessageId == message.id
+        // Potential options at this point are that the message is:
+        //   i.) incoming AND scheduled to disappear.
+        //   ii.) outgoing but NOT scheduled to disappear, or
+        //   iii.) outgoing AND scheduled to disappear.
 
-            binding.messageStatusTextView.isVisible = textId != null && (isLastSentMessage || scheduledToDisappear)
-            val showTimer = scheduledToDisappear && !message.isPending
-            binding.messageStatusImageView.isVisible = iconID != null && !showTimer && (!message.isSent || isLastSentMessage)
-
-            binding.messageStatusImageView.bringToFront()
+        // ----- Case i..) Message is incoming and scheduled to disappear -----
+        if (message.isIncoming && scheduledToDisappear) {
+            // Display the status ('Read') and the show the timer only (no delivery icon)
+            binding.messageStatusTextView.isVisible  = true
+            binding.expirationTimerView.isVisible    = true
             binding.expirationTimerView.bringToFront()
-            binding.expirationTimerView.isVisible = showTimer
-            if (showTimer) updateExpirationTimer(message)
-        } else {
-            binding.messageStatusTextView.isVisible = false
-            binding.messageStatusImageView.isVisible = false
+            updateExpirationTimer(message)
+            return
+        }
+
+        // --- If we got here then we know the message is outgoing ---
+
+        val thisUsersSessionId = TextSecurePreferences.getLocalNumber(context)
+        val lastSentMessageId = mmsSmsDb.getLastSentMessageFromSender(message.threadId, thisUsersSessionId)
+        val isLastSentMessage = lastSentMessageId == message.id
+
+        // ----- Case ii.) Message is outgoing but NOT scheduled to disappear -----
+        if (!scheduledToDisappear) {
+            // If this isn't a disappearing message then we never show the timer
+
+            // If the message has NOT been successfully sent then always show the delivery status text and icon..
+            val neitherSentNorRead = !(message.isSent || message.isRead)
+            if (neitherSentNorRead) {
+                binding.messageStatusTextView.isVisible = true
+                binding.messageStatusImageView.isVisible = true
+            } else {
+                // ..but if the message HAS been successfully sent or read then only display the delivery status
+                // text and image if this is the last sent message.
+                binding.messageStatusTextView.isVisible  = isLastSentMessage
+                binding.messageStatusImageView.isVisible = isLastSentMessage
+                if (isLastSentMessage) { binding.messageStatusImageView.bringToFront() }
+            }
+        }
+        else // ----- Case iii.) Message is outgoing AND scheduled to disappear -----
+        {
+            // Always display the delivery status text on all outgoing disappearing messages
+            binding.messageStatusTextView.isVisible = true
+
+            // If the message is sent or has been read..
+            val sentOrRead = message.isSent || message.isRead
+            if (sentOrRead) {
+                // ..then display the timer icon for this disappearing message (but keep the message status icon hidden)
+                binding.expirationTimerView.isVisible = true
+                binding.expirationTimerView.bringToFront()
+                updateExpirationTimer(message)
+            } else {
+                // If the message has NOT been sent or read (or it has failed) then show the delivery status icon rather than the timer icon
+                binding.messageStatusImageView.isVisible = true
+                binding.messageStatusImageView.bringToFront()
+            }
         }
     }
 
@@ -302,10 +360,9 @@ class VisibleMessageView : LinearLayout {
                                  @ColorInt val iconTint: Int?,
                                  @StringRes val messageText: Int?)
 
-    private fun getMessageStatusImage(message: MessageRecord): MessageStatusInfo = when {
+    private fun getMessageStatusInfo(message: MessageRecord): MessageStatusInfo = when {
         message.isFailed ->
-            MessageStatusInfo(
-                R.drawable.ic_delivery_status_failed,
+            MessageStatusInfo(R.drawable.ic_delivery_status_failed,
                 resources.getColor(R.color.destructive, context.theme),
                 R.string.delivery_status_failed
             )
@@ -318,24 +375,32 @@ class VisibleMessageView : LinearLayout {
         message.isPending ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_sending,
-                context.getColorFromAttr(R.attr.message_status_color), R.string.delivery_status_sending
+                context.getColorFromAttr(R.attr.message_status_color),
+                R.string.delivery_status_sending
             )
-        message.isResyncing ->
+        message.isSyncing || message.isResyncing ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_sending,
-                context.getColor(R.color.accent_orange), R.string.delivery_status_syncing
+                context.getColorFromAttr(R.attr.message_status_color),
+                R.string.delivery_status_sending // We COULD tell the user that we're `syncing` (R.string.delivery_status_syncing) but it will likely make more sense to them if we say "Sending"
             )
-        message.isRead || !message.isOutgoing ->
+        message.isRead || message.isIncoming ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_read,
-                context.getColorFromAttr(R.attr.message_status_color), R.string.delivery_status_read
+                context.getColorFromAttr(R.attr.message_status_color),
+                R.string.delivery_status_read
             )
-        else ->
+        message.isSent ->
             MessageStatusInfo(
                 R.drawable.ic_delivery_status_sent,
                 context.getColorFromAttr(R.attr.message_status_color),
                 R.string.delivery_status_sent
             )
+        else -> {
+            // The message isn't one we care about for message statuses we display to the user (i.e.,
+            // control messages etc. - see the  `DisplayRecord.is<WHATEVER>` suite of methods for options).
+            MessageStatusInfo(null, null, null)
+        }
     }
 
     private fun updateExpirationTimer(message: MessageRecord) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 605118f3cc..db1076e472 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -114,6 +114,11 @@ public abstract class DisplayRecord {
   public boolean isOutgoing() {
     return MmsSmsColumns.Types.isOutgoingMessageType(type);
   }
+
+  public boolean isIncoming() {
+    return !MmsSmsColumns.Types.isOutgoingMessageType(type);
+  }
+
   public boolean isGroupUpdateMessage() {
     return SmsDatabase.Types.isGroupUpdateMessage(type);
   }

From c942bbac259e33c9815e0ff4ffbc3bd5c176c031 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Wed, 17 Apr 2024 17:46:42 +0930
Subject: [PATCH 33/46] Fix margins

---
 .../java/org/thoughtcrime/securesms/SessionDialogBuilder.kt     | 1 -
 app/src/main/res/layout/dialog_clear_all_data.xml               | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
index a9b5476aa5..598977392b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/SessionDialogBuilder.kt
@@ -131,7 +131,6 @@ class SessionDialogBuilder(val context: Context) {
             setText(text)
             contentDescription = resources.getString(contentDescriptionRes)
             layoutParams = LinearLayout.LayoutParams(WRAP_CONTENT, dp60, 1f)
-                .apply { setMargins(dp20) }
             setOnClickListener {
                 listener.invoke()
                 if (dismiss) dismiss()
diff --git a/app/src/main/res/layout/dialog_clear_all_data.xml b/app/src/main/res/layout/dialog_clear_all_data.xml
index 94d4828e21..4ef5c40e8e 100644
--- a/app/src/main/res/layout/dialog_clear_all_data.xml
+++ b/app/src/main/res/layout/dialog_clear_all_data.xml
@@ -20,6 +20,8 @@
         android:id="@+id/dialogDescriptionText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:layout_marginTop="@dimen/large_spacing"
         android:text="@string/dialog_clear_all_data_message"
         android:textAlignment="center"

From 26fb268c76f9fb3d1b1fbaadac181c54a3d1d278 Mon Sep 17 00:00:00 2001
From: alansley <aclansley@gmail.com>
Date: Thu, 18 Apr 2024 07:03:27 +1000
Subject: [PATCH 34/46] WIP

---
 .../org/thoughtcrime/securesms/database/SmsDatabase.java   | 2 +-
 .../java/org/thoughtcrime/securesms/database/Storage.kt    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 450e7c2d23..7f92f366a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -634,7 +634,7 @@ public class SmsDatabase extends MessagingDatabase {
     long threadId = getThreadIdForMessage(messageId);
     db.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
     notifyConversationListeners(threadId);
-    boolean threadDeleted = DatabaseComponent.get(context).threadDatabase().update(threadId, false, true);
+    boolean threadDeleted = DatabaseComponent.get(context).threadDatabase().update(threadId, false, false);
     return threadDeleted;
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 73dadda2cb..78e1814d51 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1371,7 +1371,12 @@ open class Storage(
         val threadDB = DatabaseComponent.get(context).threadDatabase()
         val groupDB = DatabaseComponent.get(context).groupDatabase()
         threadDB.deleteConversation(threadID)
-        val recipient = getRecipientForThread(threadID) ?: return
+
+        val recipient = getRecipientForThread(threadID)
+        if (recipient == null) { Log.w(TAG, "Got null recipient when deleting conversation - aborting."); return }
+
+        Log.w("[ACL]", "When deleting conversation, recipient is: ${recipient.name}")
+
         when {
             recipient.isContactRecipient -> {
                 if (recipient.isLocalNumber) return

From 13902607b2d4393f672731a888847fa6ee734975 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 18 Apr 2024 08:51:04 +1000
Subject: [PATCH 35/46] Commit before converting SmsDatabase from Java to
 Kotlin

---
 .../securesms/database/SmsDatabase.java       | 22 +++---
 .../securesms/database/ThreadDatabase.java    | 76 ++++++++++---------
 .../database/helpers/SQLCipherOpenHelper.java |  2 +-
 3 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
index 7f92f366a8..5166b4fdf3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -701,12 +701,7 @@ public class SmsDatabase extends MessagingDatabase {
     }
   }
 
-  /*package */void deleteThread(long threadId) {
-    SQLiteDatabase db = databaseHelper.getWritableDatabase();
-    db.delete(TABLE_NAME, THREAD_ID + " = ?", new String[] {threadId+""});
-  }
-
-  /*package*/void deleteMessagesInThreadBeforeDate(long threadId, long date) {
+  void deleteMessagesInThreadBeforeDate(long threadId, long date) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     String where      = THREAD_ID + " = ? AND (CASE " + TYPE;
 
@@ -719,7 +714,12 @@ public class SmsDatabase extends MessagingDatabase {
     db.delete(TABLE_NAME, where, new String[] {threadId + ""});
   }
 
-  /*package*/ void deleteThreads(Set<Long> threadIds) {
+  void deleteThread(long threadId) {
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+    db.delete(TABLE_NAME, THREAD_ID + " = ?", new String[] {threadId+""});
+  }
+
+  void deleteThreads(Set<Long> threadIds) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     String where      = "";
 
@@ -727,23 +727,23 @@ public class SmsDatabase extends MessagingDatabase {
       where += THREAD_ID + " = '" + threadId + "' OR ";
     }
 
-    where = where.substring(0, where.length() - 4);
+    where = where.substring(0, where.length() - 4); // Remove the final: "' OR "
 
     db.delete(TABLE_NAME, where, null);
   }
 
-  /*package */ void deleteAllThreads() {
+  void deleteAllThreads() {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.delete(TABLE_NAME, null, null);
   }
 
-  /*package*/ SQLiteDatabase beginTransaction() {
+  SQLiteDatabase beginTransaction() {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     database.beginTransaction();
     return database;
   }
 
-  /*package*/ void endTransaction(SQLiteDatabase database) {
+  void endTransaction(SQLiteDatabase database) {
     database.setTransactionSuccessful();
     database.endTransaction();
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index 507088a0ad..c8605b1a59 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -26,14 +26,10 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.MergeCursor;
 import android.net.Uri;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.annimon.stream.Stream;
-
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
-
 import org.jetbrains.annotations.NotNull;
 import org.session.libsession.snode.SnodeAPI;
 import org.session.libsession.utilities.Address;
@@ -61,14 +57,12 @@ import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
 import org.thoughtcrime.securesms.util.SessionMetaProtocol;
-
 import java.io.Closeable;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class ThreadDatabase extends Database {
 
@@ -83,7 +77,7 @@ public class ThreadDatabase extends Database {
 
   public  static final String TABLE_NAME             = "thread";
   public  static final String ID                     = "_id";
-  public  static final String DATE                   = "date";
+  public  static final String THREAD_CREATION_DATE   = "date";
   public  static final String MESSAGE_COUNT          = "message_count";
   public  static final String ADDRESS                = "recipient_ids";
   public  static final String SNIPPET                = "snippet";
@@ -91,7 +85,7 @@ public class ThreadDatabase extends Database {
   public  static final String READ                   = "read";
   public  static final String UNREAD_COUNT           = "unread_count";
   public  static final String UNREAD_MENTION_COUNT   = "unread_mention_count";
-  public  static final String TYPE                   = "type";
+  public  static final String DISTRIBUTION_TYPE      = "type"; // See: DistributionTypes.kt
   private static final String ERROR                  = "error";
   public  static final String SNIPPET_TYPE           = "snippet_type";
   public  static final String SNIPPET_URI            = "snippet_uri";
@@ -101,27 +95,27 @@ public class ThreadDatabase extends Database {
   public  static final String READ_RECEIPT_COUNT     = "read_receipt_count";
   public  static final String EXPIRES_IN             = "expires_in";
   public  static final String LAST_SEEN              = "last_seen";
-  public static final String HAS_SENT               = "has_sent";
+  public static final String HAS_SENT                = "has_sent";
   public  static final String IS_PINNED              = "is_pinned";
 
   public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("                    +
-    ID + " INTEGER PRIMARY KEY, " + DATE + " INTEGER DEFAULT 0, "                                  +
+    ID + " INTEGER PRIMARY KEY, " + THREAD_CREATION_DATE + " INTEGER DEFAULT 0, "                  +
     MESSAGE_COUNT + " INTEGER DEFAULT 0, " + ADDRESS + " TEXT, " + SNIPPET + " TEXT, "             +
     SNIPPET_CHARSET + " INTEGER DEFAULT 0, " + READ + " INTEGER DEFAULT 1, "                       +
-    TYPE + " INTEGER DEFAULT 0, " + ERROR + " INTEGER DEFAULT 0, "                                 +
+          DISTRIBUTION_TYPE + " INTEGER DEFAULT 0, " + ERROR + " INTEGER DEFAULT 0, "                    +
     SNIPPET_TYPE + " INTEGER DEFAULT 0, " + SNIPPET_URI + " TEXT DEFAULT NULL, "                   +
     ARCHIVED + " INTEGER DEFAULT 0, " + STATUS + " INTEGER DEFAULT 0, "                            +
     DELIVERY_RECEIPT_COUNT + " INTEGER DEFAULT 0, " + EXPIRES_IN + " INTEGER DEFAULT 0, "          +
     LAST_SEEN + " INTEGER DEFAULT 0, " + HAS_SENT + " INTEGER DEFAULT 0, "                         +
     READ_RECEIPT_COUNT + " INTEGER DEFAULT 0, " + UNREAD_COUNT + " INTEGER DEFAULT 0);";
 
-  public static final String[] CREATE_INDEXS = {
+  public static final String[] CREATE_INDEXES = {
     "CREATE INDEX IF NOT EXISTS thread_recipient_ids_index ON " + TABLE_NAME + " (" + ADDRESS + ");",
     "CREATE INDEX IF NOT EXISTS archived_count_index ON " + TABLE_NAME + " (" + ARCHIVED + ", " + MESSAGE_COUNT + ");",
   };
 
   private static final String[] THREAD_PROJECTION = {
-      ID, DATE, MESSAGE_COUNT, ADDRESS, SNIPPET, SNIPPET_CHARSET, READ, UNREAD_COUNT, UNREAD_MENTION_COUNT, TYPE, ERROR, SNIPPET_TYPE,
+      ID, THREAD_CREATION_DATE, MESSAGE_COUNT, ADDRESS, SNIPPET, SNIPPET_CHARSET, READ, UNREAD_COUNT, UNREAD_MENTION_COUNT, DISTRIBUTION_TYPE, ERROR, SNIPPET_TYPE,
       SNIPPET_URI, ARCHIVED, STATUS, DELIVERY_RECEIPT_COUNT, EXPIRES_IN, LAST_SEEN, READ_RECEIPT_COUNT, IS_PINNED
   };
 
@@ -131,8 +125,8 @@ public class ThreadDatabase extends Database {
 
   private static final List<String> COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION = Stream.concat(Stream.concat(Stream.of(TYPED_THREAD_PROJECTION),
                                                                                                              Stream.of(RecipientDatabase.TYPED_RECIPIENT_PROJECTION)),
-                                                                                               Stream.of(GroupDatabase.TYPED_GROUP_PROJECTION))
-                                                                                       .toList();
+                                                                                                             Stream.of(GroupDatabase.TYPED_GROUP_PROJECTION))
+                                                                                                             .toList();
 
   public static String getCreatePinnedCommand() {
     return "ALTER TABLE "+ TABLE_NAME + " " +
@@ -158,11 +152,10 @@ public class ThreadDatabase extends Database {
     ContentValues contentValues = new ContentValues(4);
     long date                   = SnodeAPI.getNowWithOffset();
 
-    contentValues.put(DATE, date - date % 1000);
+    contentValues.put(THREAD_CREATION_DATE, date - date % 1000);
     contentValues.put(ADDRESS, address.serialize());
 
-    if (group)
-      contentValues.put(TYPE, distributionType);
+    if (group) contentValues.put(DISTRIBUTION_TYPE, distributionType);
 
     contentValues.put(MESSAGE_COUNT, 0);
 
@@ -175,7 +168,7 @@ public class ThreadDatabase extends Database {
                             long expiresIn, int readReceiptCount)
   {
     ContentValues contentValues = new ContentValues(7);
-    contentValues.put(DATE, date - date % 1000);
+    contentValues.put(THREAD_CREATION_DATE, date - date % 1000);
     contentValues.put(MESSAGE_COUNT, count);
     if (!body.isEmpty()) {
       contentValues.put(SNIPPET, body);
@@ -187,19 +180,19 @@ public class ThreadDatabase extends Database {
     contentValues.put(READ_RECEIPT_COUNT, readReceiptCount);
     contentValues.put(EXPIRES_IN, expiresIn);
 
-    if (unarchive) {
-      contentValues.put(ARCHIVED, 0);
-    }
+    if (unarchive) { contentValues.put(ARCHIVED, 0); }
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.update(TABLE_NAME, contentValues, ID + " = ?", new String[] {threadId + ""});
     notifyConversationListListeners();
   }
 
+  // ACL remove unused method
+  /*
   public void updateSnippet(long threadId, String snippet, @Nullable Uri attachment, long date, long type, boolean unarchive) {
     ContentValues contentValues = new ContentValues(4);
 
-    contentValues.put(DATE, date - date % 1000);
+    contentValues.put(THREAD_CREATION_DATE, date - date % 1000);
     if (!snippet.isEmpty()) {
       contentValues.put(SNIPPET, snippet);
     }
@@ -214,6 +207,7 @@ public class ThreadDatabase extends Database {
     db.update(TABLE_NAME, contentValues, ID + " = ?", new String[] {threadId + ""});
     notifyConversationListListeners();
   }
+  */
 
   private void deleteThread(long threadId) {
     Recipient recipient = getRecipientForThreadId(threadId);
@@ -226,6 +220,8 @@ public class ThreadDatabase extends Database {
     }
   }
 
+  // ACL remove unused methods
+  /*
   private void deleteThreads(Set<Long> threadIds) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     String where      = "";
@@ -249,6 +245,7 @@ public class ThreadDatabase extends Database {
     addressCache.clear();
     notifyConversationListListeners();
   }
+  */
 
   public void trimAllThreads(int length, ProgressListener listener) {
     Cursor cursor   = null;
@@ -356,18 +353,21 @@ public class ThreadDatabase extends Database {
     }};
   }
 
+  // ACL remove unused method
+  /*
   public void setDistributionType(long threadId, int distributionType) {
     ContentValues contentValues = new ContentValues(1);
-    contentValues.put(TYPE, distributionType);
+    contentValues.put(CONVERSATION_TYPE, distributionType);
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId + ""});
     notifyConversationListListeners();
   }
+  */
 
   public void setDate(long threadId, long date) {
     ContentValues contentValues = new ContentValues(1);
-    contentValues.put(DATE, date);
+    contentValues.put(THREAD_CREATION_DATE, date);
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     int updated = db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId+""});
     if (updated > 0) notifyConversationListListeners();
@@ -375,11 +375,11 @@ public class ThreadDatabase extends Database {
 
   public int getDistributionType(long threadId) {
     SQLiteDatabase db     = databaseHelper.getReadableDatabase();
-    Cursor         cursor = db.query(TABLE_NAME, new String[]{TYPE}, ID_WHERE, new String[]{String.valueOf(threadId)}, null, null, null);
+    Cursor         cursor = db.query(TABLE_NAME, new String[]{DISTRIBUTION_TYPE}, ID_WHERE, new String[]{String.valueOf(threadId)}, null, null, null);
 
     try {
       if (cursor != null && cursor.moveToNext()) {
-        return cursor.getInt(cursor.getColumnIndexOrThrow(TYPE));
+        return cursor.getInt(cursor.getColumnIndexOrThrow(DISTRIBUTION_TYPE));
       }
 
       return DistributionTypes.DEFAULT;
@@ -469,7 +469,7 @@ public class ThreadDatabase extends Database {
     Cursor cursor     = null;
 
     try {
-      String where    = "SELECT " + DATE + " FROM " + TABLE_NAME +
+      String where    = "SELECT " + THREAD_CREATION_DATE + " FROM " + TABLE_NAME +
               " LEFT OUTER JOIN " + RecipientDatabase.TABLE_NAME +
               " ON " + TABLE_NAME + "." + ADDRESS + " = " + RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.ADDRESS +
               " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME +
@@ -477,7 +477,7 @@ public class ThreadDatabase extends Database {
               " WHERE " + MESSAGE_COUNT + " != 0 AND " + ARCHIVED + " = 0 AND " + HAS_SENT + " = 0 AND " +
               RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.BLOCK + " = 0 AND " +
               RecipientDatabase.TABLE_NAME + "." + RecipientDatabase.APPROVED + " = 0 AND " +
-              GroupDatabase.TABLE_NAME + "." + GROUP_ID + " IS NULL ORDER BY " + DATE + " DESC LIMIT 1";
+              GroupDatabase.TABLE_NAME + "." + GROUP_ID + " IS NULL ORDER BY " + THREAD_CREATION_DATE + " DESC LIMIT 1";
       cursor          = db.rawQuery(where, null);
 
       if (cursor != null && cursor.moveToFirst())
@@ -595,7 +595,7 @@ public class ThreadDatabase extends Database {
 
   public Long getLastUpdated(long threadId) {
     SQLiteDatabase db     = databaseHelper.getReadableDatabase();
-    Cursor         cursor = db.query(TABLE_NAME, new String[]{DATE}, ID_WHERE, new String[]{String.valueOf(threadId)}, null, null, null);
+    Cursor         cursor = db.query(TABLE_NAME, new String[]{THREAD_CREATION_DATE}, ID_WHERE, new String[]{String.valueOf(threadId)}, null, null, null);
 
     try {
       if (cursor != null && cursor.moveToFirst()) {
@@ -622,6 +622,9 @@ public class ThreadDatabase extends Database {
   }
 
   public void deleteConversation(long threadId) {
+
+    Log.w("[ACL]", "Hit ThreadDatabase.deleteConversation");
+
     DatabaseComponent.get(context).smsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).mmsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).draftDatabase().clearDrafts(threadId);
@@ -733,10 +736,13 @@ public class ThreadDatabase extends Database {
   }
 
   public boolean update(long threadId, boolean unarchive, boolean shouldDeleteOnEmpty) {
+
+    Log.w("[ACL]", "Hit ThreadDatabase.update!");
+
     MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
     long count                    = mmsSmsDatabase.getConversationCount(threadId);
 
-    boolean shouldDeleteEmptyThread = shouldDeleteOnEmpty && deleteThreadOnEmpty(threadId);
+    boolean shouldDeleteEmptyThread = shouldDeleteOnEmpty && possibleToDeleteThreadOnEmpty(threadId);
 
     if (count == 0 && shouldDeleteEmptyThread) {
       deleteThread(threadId);
@@ -810,7 +816,7 @@ public class ThreadDatabase extends Database {
     return setLastSeen(threadId, lastSeenTime);
   }
 
-  private boolean deleteThreadOnEmpty(long threadId) {
+  private boolean possibleToDeleteThreadOnEmpty(long threadId) {
     Recipient threadRecipient = getRecipientForThreadId(threadId);
     return threadRecipient != null && !threadRecipient.isCommunityRecipient();
   }
@@ -855,7 +861,7 @@ public class ThreadDatabase extends Database {
            " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME +
            " ON " + TABLE_NAME + "." + ADDRESS + " = " + GroupDatabase.TABLE_NAME + "." + GROUP_ID +
            " WHERE " + where +
-           " ORDER BY " + TABLE_NAME + "." + IS_PINNED + " DESC, " + TABLE_NAME + "." + DATE + " DESC";
+           " ORDER BY " + TABLE_NAME + "." + IS_PINNED + " DESC, " + TABLE_NAME + "." + THREAD_CREATION_DATE + " DESC";
 
     if (limit >  0) {
       query += " LIMIT " + limit;
@@ -900,7 +906,7 @@ public class ThreadDatabase extends Database {
 
     public ThreadRecord getCurrent() {
       long    threadId         = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.ID));
-      int     distributionType = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.TYPE));
+      int     distributionType = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.DISTRIBUTION_TYPE));
       Address address          = Address.fromSerialized(cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.ADDRESS)));
 
       Optional<RecipientSettings> settings;
@@ -916,7 +922,7 @@ public class ThreadDatabase extends Database {
 
       Recipient          recipient            = Recipient.from(context, address, settings, groupRecord, true);
       String             body                 = cursor.getString(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET));
-      long               date                 = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.DATE));
+      long               date                 = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.THREAD_CREATION_DATE));
       long               count                = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.MESSAGE_COUNT));
       int                unreadCount          = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.UNREAD_COUNT));
       int                unreadMentionCount   = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.UNREAD_MENTION_COUNT));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 7713043c2c..cd1988e83f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -357,7 +357,7 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
     executeStatements(db, SmsDatabase.CREATE_INDEXS);
     executeStatements(db, MmsDatabase.CREATE_INDEXS);
     executeStatements(db, AttachmentDatabase.CREATE_INDEXS);
-    executeStatements(db, ThreadDatabase.CREATE_INDEXS);
+    executeStatements(db, ThreadDatabase.CREATE_INDEXES);
     executeStatements(db, DraftDatabase.CREATE_INDEXS);
     executeStatements(db, GroupDatabase.CREATE_INDEXS);
     executeStatements(db, GroupReceiptDatabase.CREATE_INDEXES);

From 207da1811551ba081bda2e58bec1d079998b0a91 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Thu, 18 Apr 2024 12:59:53 +0930
Subject: [PATCH 36/46] Remove old expiration config strings from
 UpdateMessageBuilder

---
 app/src/main/res/layout/view_control_message.xml    |  2 +-
 .../messaging/utilities/UpdateMessageBuilder.kt     | 13 ++++---------
 libsession/src/main/res/values-fr-rFR/strings.xml   |  4 ----
 libsession/src/main/res/values-fr/strings.xml       |  4 ----
 libsession/src/main/res/values/strings.xml          |  4 ----
 5 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index 3cbe26048e..56b0c91867 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -48,7 +48,7 @@
         android:textColor="?android:textColorPrimary"
         android:textSize="@dimen/very_small_font_size"
         android:textStyle="bold"
-        tools:text="@string/MessageRecord_you_disabled_disappearing_messages" />
+        tools:text="You disabled disappearing messages" />
 
     <FrameLayout
         android:id="@+id/call_view"
diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index 82fb071e62..c0b5b23fb6 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -10,7 +10,6 @@ import org.session.libsession.messaging.calls.CallMessageType.CALL_INCOMING
 import org.session.libsession.messaging.calls.CallMessageType.CALL_MISSED
 import org.session.libsession.messaging.calls.CallMessageType.CALL_OUTGOING
 import org.session.libsession.messaging.contacts.Contact
-import org.session.libsession.messaging.messages.ExpirationConfiguration.Companion.isNewConfigEnabled
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.utilities.ExpirationUtil
 import org.session.libsession.utilities.getExpirationTypeDisplayValue
@@ -90,25 +89,21 @@ object UpdateMessageBuilder {
         val senderName = if (isOutgoing) context.getString(R.string.MessageRecord_you) else getSenderName(senderId!!)
         return if (duration <= 0) {
             if (isOutgoing) {
-                if (!isNewConfigEnabled) context.getString(R.string.MessageRecord_you_disabled_disappearing_messages)
-                else context.getString(if (recipient.is1on1) R.string.MessageRecord_you_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_you_turned_off_disappearing_messages)
+                context.getString(if (recipient.is1on1) R.string.MessageRecord_you_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_you_turned_off_disappearing_messages)
             } else {
-                if (!isNewConfigEnabled) context.getString(R.string.MessageRecord_s_disabled_disappearing_messages, senderName)
-                else context.getString(if (recipient.is1on1) R.string.MessageRecord_s_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_s_turned_off_disappearing_messages, senderName)
+                context.getString(if (recipient.is1on1) R.string.MessageRecord_s_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_s_turned_off_disappearing_messages, senderName)
             }
         } else {
             val time = ExpirationUtil.getExpirationDisplayValue(context, duration.toInt())
             val action = context.getExpirationTypeDisplayValue(timestamp == expireStarted)
             if (isOutgoing) {
-                if (!isNewConfigEnabled) context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time)
-                else context.getString(
+                context.getString(
                     if (recipient.is1on1) R.string.MessageRecord_you_set_messages_to_disappear_s_after_s_1_on_1 else R.string.MessageRecord_you_set_messages_to_disappear_s_after_s,
                     time,
                     action
                 )
             } else {
-                if (!isNewConfigEnabled) context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, senderName, time)
-                else context.getString(
+                context.getString(
                     if (recipient.is1on1) R.string.MessageRecord_s_set_messages_to_disappear_s_after_s_1_on_1 else R.string.MessageRecord_s_set_messages_to_disappear_s_after_s,
                     senderName,
                     time,
diff --git a/libsession/src/main/res/values-fr-rFR/strings.xml b/libsession/src/main/res/values-fr-rFR/strings.xml
index c8324290f7..0298ae07f0 100644
--- a/libsession/src/main/res/values-fr-rFR/strings.xml
+++ b/libsession/src/main/res/values-fr-rFR/strings.xml
@@ -15,10 +15,6 @@
     <string name="MessageRecord_s_called_you">%s vous a appelé·e</string>
     <string name="MessageRecord_called_s">Vous avez appelé %s</string>
     <string name="MessageRecord_missed_call_from">Appel manqué de %s</string>
-    <string name="MessageRecord_you_disabled_disappearing_messages">Vous avez désactivé les messages éphémères.</string>
-    <string name="MessageRecord_s_disabled_disappearing_messages">%1$s a désactivé les messages éphémères.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">Vous avez défini l’expiration des messages éphémères à %1$s</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s a défini l’expiration des messages éphémères à %2$s</string>
     <string name="MessageRecord_s_took_a_screenshot">%1$s a pris une capture d\'écran.</string>
     <string name="MessageRecord_media_saved_by_s">%1$s a enregistré le média.</string>
     <!-- expiration -->
diff --git a/libsession/src/main/res/values-fr/strings.xml b/libsession/src/main/res/values-fr/strings.xml
index c8324290f7..0298ae07f0 100644
--- a/libsession/src/main/res/values-fr/strings.xml
+++ b/libsession/src/main/res/values-fr/strings.xml
@@ -15,10 +15,6 @@
     <string name="MessageRecord_s_called_you">%s vous a appelé·e</string>
     <string name="MessageRecord_called_s">Vous avez appelé %s</string>
     <string name="MessageRecord_missed_call_from">Appel manqué de %s</string>
-    <string name="MessageRecord_you_disabled_disappearing_messages">Vous avez désactivé les messages éphémères.</string>
-    <string name="MessageRecord_s_disabled_disappearing_messages">%1$s a désactivé les messages éphémères.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">Vous avez défini l’expiration des messages éphémères à %1$s</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s a défini l’expiration des messages éphémères à %2$s</string>
     <string name="MessageRecord_s_took_a_screenshot">%1$s a pris une capture d\'écran.</string>
     <string name="MessageRecord_media_saved_by_s">%1$s a enregistré le média.</string>
     <!-- expiration -->
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index 1527c32d81..7e4ffed396 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -17,17 +17,13 @@
     <string name="MessageRecord_missed_call_from">Missed call from %s</string>
     <string name="MessageRecord_follow_setting">Follow Setting</string>
     <string name="AccessibilityId_follow_setting">Follow setting</string>
-    <string name="MessageRecord_you_disabled_disappearing_messages">You disabled disappearing messages.</string>
     <string name="MessageRecord_you_turned_off_disappearing_messages">You have turned off disappearing messages.</string>
     <string name="MessageRecord_you_turned_off_disappearing_messages_1_on_1">You turned off disappearing messages. Messages you send will no longer disappear.</string>
-    <string name="MessageRecord_s_disabled_disappearing_messages">%1$s disabled disappearing messages.</string>
     <string name="MessageRecord_s_turned_off_disappearing_messages">%1$s turned off disappearing messages.</string>
     <string name="MessageRecord_s_turned_off_disappearing_messages_1_on_1">%1$s has turned off disappearing messages. Messages they send will no longer disappear.</string>
-    <string name="MessageRecord_you_set_disappearing_message_time_to_s">You set the disappearing message timer to %1$s</string>
     <string name="MessageRecord_you_set_messages_to_disappear_s_after_s">You have set messages to disappear %1$s after they have been %2$s</string>
     <string name="MessageRecord_you_set_messages_to_disappear_s_after_s_1_on_1">You set your messages to disappear %1$s after they have been %2$s.</string>
     <string name="MessageRecord_you_changed_messages_to_disappear_s_after_s">You have changed messages to disappear %1$s after they have been %2$s</string>
-    <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s set the disappearing message timer to %2$s</string>
     <string name="MessageRecord_s_set_messages_to_disappear_s_after_s">%1$s has set messages to disappear %2$s after they have been %3$s</string>
     <string name="MessageRecord_s_set_messages_to_disappear_s_after_s_1_on_1">%1$s has set their messages to disappear %2$s after they have been %3$s.</string>
     <string name="MessageRecord_s_changed_messages_to_disappear_s_after_s">%1$s has changed messages to disappear %2$s after they have been %3$s</string>

From 0ba18dcd464131232d1e7a5c39c99de94be34383 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Thu, 18 Apr 2024 13:40:02 +0930
Subject: [PATCH 37/46] Fix group expiration update config messages

---
 .../database/model/MessageRecord.java         |  4 +-
 .../utilities/UpdateMessageBuilder.kt         | 91 +++++++------------
 2 files changed, 37 insertions(+), 58 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index b5b0aea20c..a61b78b4b6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -31,6 +31,7 @@ import org.session.libsession.messaging.utilities.UpdateMessageData;
 import org.session.libsession.utilities.IdentityKeyMismatch;
 import org.session.libsession.utilities.NetworkFailure;
 import org.session.libsession.utilities.recipients.Recipient;
+import org.thoughtcrime.securesms.dependencies.DatabaseComponent;
 
 import java.util.List;
 import java.util.Objects;
@@ -120,7 +121,8 @@ public abstract class MessageRecord extends DisplayRecord {
       return new SpannableString(UpdateMessageBuilder.INSTANCE.buildGroupUpdateMessage(context, updateMessageData, getIndividualRecipient().getAddress().serialize(), isOutgoing()));
     } else if (isExpirationTimerUpdate()) {
       int seconds = (int) (getExpiresIn() / 1000);
-      return new SpannableString(UpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, getRecipient(), getIndividualRecipient().getAddress().serialize(), isOutgoing(), getTimestamp(), expireStarted));
+      boolean isGroup = DatabaseComponent.get(context).threadDatabase().getRecipientForThreadId(getThreadId()).isGroupRecipient();
+      return new SpannableString(UpdateMessageBuilder.INSTANCE.buildExpirationTimerMessage(context, seconds, isGroup, getIndividualRecipient().getAddress().serialize(), isOutgoing(), getTimestamp(), expireStarted));
     } else if (isDataExtractionNotification()) {
       if (isScreenshotNotification()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.SCREENSHOT, getIndividualRecipient().getAddress().serialize())));
       else if (isMediaSavedNotification()) return new SpannableString((UpdateMessageBuilder.INSTANCE.buildDataExtractionMessage(context, DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED, getIndividualRecipient().getAddress().serialize())));
diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index c0b5b23fb6..ae4c47e10a 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -11,9 +11,10 @@ import org.session.libsession.messaging.calls.CallMessageType.CALL_MISSED
 import org.session.libsession.messaging.calls.CallMessageType.CALL_OUTGOING
 import org.session.libsession.messaging.contacts.Contact
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
+import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED
+import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage.Kind.SCREENSHOT
 import org.session.libsession.utilities.ExpirationUtil
 import org.session.libsession.utilities.getExpirationTypeDisplayValue
-import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsession.utilities.truncateIdForDisplay
 
 object UpdateMessageBuilder {
@@ -30,47 +31,35 @@ object UpdateMessageBuilder {
         else getSenderName(senderId!!)
 
         return when (updateData) {
-            is UpdateMessageData.Kind.GroupCreation -> if (isOutgoing) {
-                context.getString(R.string.MessageRecord_you_created_a_new_group)
-            } else {
-                context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName)
+            is UpdateMessageData.Kind.GroupCreation -> {
+                if (isOutgoing) context.getString(R.string.MessageRecord_you_created_a_new_group)
+                else context.getString(R.string.MessageRecord_s_added_you_to_the_group, senderName)
             }
-            is UpdateMessageData.Kind.GroupNameChange -> if (isOutgoing) {
-                context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.name)
-            } else {
-                context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.name)
+            is UpdateMessageData.Kind.GroupNameChange -> {
+                if (isOutgoing) context.getString(R.string.MessageRecord_you_renamed_the_group_to_s, updateData.name)
+                else context.getString(R.string.MessageRecord_s_renamed_the_group_to_s, senderName, updateData.name)
             }
             is UpdateMessageData.Kind.GroupMemberAdded -> {
                 val members = updateData.updatedMembers.joinToString(", ", transform = ::getSenderName)
-                if (isOutgoing) {
-                    context.getString(R.string.MessageRecord_you_added_s_to_the_group, members)
-                } else {
-                    context.getString(R.string.MessageRecord_s_added_s_to_the_group, senderName, members)
-                }
+                if (isOutgoing) context.getString(R.string.MessageRecord_you_added_s_to_the_group, members)
+                else context.getString(R.string.MessageRecord_s_added_s_to_the_group, senderName, members)
             }
             is UpdateMessageData.Kind.GroupMemberRemoved -> {
                 val userPublicKey = storage.getUserPublicKey()!!
                 // 1st case: you are part of the removed members
                 return if (userPublicKey in updateData.updatedMembers) {
-                    if (isOutgoing) {
-                        context.getString(R.string.MessageRecord_left_group)
-                    } else {
-                        context.getString(R.string.MessageRecord_you_were_removed_from_the_group)
-                    }
+                    if (isOutgoing) context.getString(R.string.MessageRecord_left_group)
+                    else context.getString(R.string.MessageRecord_you_were_removed_from_the_group)
                 } else {
                     // 2nd case: you are not part of the removed members
                     val members = updateData.updatedMembers.joinToString(", ", transform = ::getSenderName)
-                    if (isOutgoing) {
-                        context.getString(R.string.MessageRecord_you_removed_s_from_the_group, members)
-                    } else {
-                        context.getString(R.string.MessageRecord_s_removed_s_from_the_group, senderName, members)
-                    }
+                    if (isOutgoing) context.getString(R.string.MessageRecord_you_removed_s_from_the_group, members)
+                    else context.getString(R.string.MessageRecord_s_removed_s_from_the_group, senderName, members)
                 }
             }
-            is UpdateMessageData.Kind.GroupMemberLeft -> if (isOutgoing) {
-                context.getString(R.string.MessageRecord_left_group)
-            } else {
-                context.getString(R.string.ConversationItem_group_action_left, senderName)
+            is UpdateMessageData.Kind.GroupMemberLeft -> {
+                if (isOutgoing) context.getString(R.string.MessageRecord_left_group)
+                else context.getString(R.string.ConversationItem_group_action_left, senderName)
             }
             else -> return ""
         }
@@ -79,7 +68,7 @@ object UpdateMessageBuilder {
     fun buildExpirationTimerMessage(
         context: Context,
         duration: Long,
-        recipient: Recipient,
+        isGroup: Boolean,
         senderId: String? = null,
         isOutgoing: Boolean = false,
         timestamp: Long,
@@ -88,40 +77,28 @@ object UpdateMessageBuilder {
         if (!isOutgoing && senderId == null) return ""
         val senderName = if (isOutgoing) context.getString(R.string.MessageRecord_you) else getSenderName(senderId!!)
         return if (duration <= 0) {
-            if (isOutgoing) {
-                context.getString(if (recipient.is1on1) R.string.MessageRecord_you_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_you_turned_off_disappearing_messages)
-            } else {
-                context.getString(if (recipient.is1on1) R.string.MessageRecord_s_turned_off_disappearing_messages_1_on_1 else R.string.MessageRecord_s_turned_off_disappearing_messages, senderName)
-            }
+            if (isOutgoing) context.getString(if (isGroup) R.string.MessageRecord_you_turned_off_disappearing_messages else R.string.MessageRecord_you_turned_off_disappearing_messages_1_on_1)
+            else context.getString(if (isGroup) R.string.MessageRecord_s_turned_off_disappearing_messages else R.string.MessageRecord_s_turned_off_disappearing_messages_1_on_1, senderName)
         } else {
             val time = ExpirationUtil.getExpirationDisplayValue(context, duration.toInt())
             val action = context.getExpirationTypeDisplayValue(timestamp == expireStarted)
-            if (isOutgoing) {
-                context.getString(
-                    if (recipient.is1on1) R.string.MessageRecord_you_set_messages_to_disappear_s_after_s_1_on_1 else R.string.MessageRecord_you_set_messages_to_disappear_s_after_s,
-                    time,
-                    action
-                )
-            } else {
-                context.getString(
-                    if (recipient.is1on1) R.string.MessageRecord_s_set_messages_to_disappear_s_after_s_1_on_1 else R.string.MessageRecord_s_set_messages_to_disappear_s_after_s,
-                    senderName,
-                    time,
-                    action
-                )
-            }
+            if (isOutgoing) context.getString(
+                if (isGroup) R.string.MessageRecord_you_set_messages_to_disappear_s_after_s else R.string.MessageRecord_you_set_messages_to_disappear_s_after_s_1_on_1,
+                time,
+                action
+            ) else context.getString(
+                if (isGroup) R.string.MessageRecord_s_set_messages_to_disappear_s_after_s else R.string.MessageRecord_s_set_messages_to_disappear_s_after_s_1_on_1,
+                senderName,
+                time,
+                action
+            )
         }
     }
 
-    fun buildDataExtractionMessage(context: Context, kind: DataExtractionNotificationInfoMessage.Kind, senderId: String? = null): String {
-        val senderName = getSenderName(senderId!!)
-        return when (kind) {
-            DataExtractionNotificationInfoMessage.Kind.SCREENSHOT ->
-                context.getString(R.string.MessageRecord_s_took_a_screenshot, senderName)
-            DataExtractionNotificationInfoMessage.Kind.MEDIA_SAVED ->
-                context.getString(R.string.MessageRecord_media_saved_by_s, senderName)
-        }
-    }
+    fun buildDataExtractionMessage(context: Context, kind: DataExtractionNotificationInfoMessage.Kind, senderId: String? = null) = when (kind) {
+        SCREENSHOT -> R.string.MessageRecord_s_took_a_screenshot
+        MEDIA_SAVED -> R.string.MessageRecord_media_saved_by_s
+    }.let { context.getString(it, getSenderName(senderId!!)) }
 
     fun buildCallMessage(context: Context, type: CallMessageType, sender: String): String =
         when (type) {

From 2b464419776ac43f12654282d3c96cee3cf1263b Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 18 Apr 2024 14:29:55 +1000
Subject: [PATCH 38/46] Fixed conversation view closing + hopefully wrong
 status text displayed + deletion of contact on removal of last message in
 1-on-1 convo

---
 .../conversation/start/ContactListAdapter.kt  | 44 ++++++++++++-------
 .../securesms/database/Storage.kt             | 11 ++---
 .../repository/ConversationRepository.kt      | 18 ++------
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
index 68e2f975c9..29a94cdcd4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
@@ -4,10 +4,15 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import network.loki.messenger.R
 import network.loki.messenger.databinding.ContactSectionHeaderBinding
 import network.loki.messenger.databinding.ViewContactBinding
 import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsignal.utilities.Log
+import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.showSessionDialog
+import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 sealed class ContactListItem {
     class Header(val name: String) : ContactListItem()
@@ -35,11 +40,28 @@ class ContactListAdapter(
             binding.profilePictureView.update(contact.recipient)
             binding.nameTextView.text = contact.displayName
             binding.root.setOnClickListener { listener(contact.recipient) }
+
+            // TODO: When we implement deleting contacts then probably do it here w/ something like:
+            /*
+            binding.root.setOnLongClickListener {
+                Log.w("[ACL]", "Long clicked on contact ${contact.recipient.name}")
+                binding.contentView.context.showSessionDialog {
+                    title("Delete Contact")
+                    text("Are you sure you want to delete this contact?")
+                    button(R.string.delete) {
+                        val contacts = configFactory.contacts ?: return
+                        contacts.upsertContact(contact.recipient.address.serialize()) { priority = PRIORITY_HIDDEN }
+                        ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
+                        endActionMode()
+                    }
+                    cancelButton(::endActionMode)
+                }
+                true
+            }
+            */
         }
 
-        fun unbind() {
-            binding.profilePictureView.recycle()
-        }
+        fun unbind() { binding.profilePictureView.recycle() }
     }
 
     class HeaderViewHolder(
@@ -52,15 +74,11 @@ class ContactListAdapter(
         }
     }
 
-    override fun getItemCount(): Int {
-        return items.size
-    }
+    override fun getItemCount(): Int { return items.size }
 
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
         super.onViewRecycled(holder)
-        if (holder is ContactViewHolder) {
-            holder.unbind()
-        }
+        if (holder is ContactViewHolder) { holder.unbind() }
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -72,13 +90,9 @@ class ContactListAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         return if (viewType == ViewType.Contact) {
-            ContactViewHolder(
-                ViewContactBinding.inflate(LayoutInflater.from(context), parent, false)
-            )
+            ContactViewHolder(ViewContactBinding.inflate(LayoutInflater.from(context), parent, false))
         } else {
-            HeaderViewHolder(
-                ContactSectionHeaderBinding.inflate(LayoutInflater.from(context), parent, false)
-            )
+            HeaderViewHolder(ContactSectionHeaderBinding.inflate(LayoutInflater.from(context), parent, false))
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 78e1814d51..380b816f24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -99,7 +99,7 @@ private const val TAG = "Storage"
 open class Storage(
     context: Context,
     helper: SQLCipherOpenHelper,
-    private val configFactory: ConfigFactory
+    val configFactory: ConfigFactory
 ) : Database(context, helper), StorageProtocol, ThreadDatabase.ConversationThreadUpdateListener {
 
     override fun threadCreated(address: Address, threadId: Long) {
@@ -1378,12 +1378,9 @@ open class Storage(
         Log.w("[ACL]", "When deleting conversation, recipient is: ${recipient.name}")
 
         when {
-            recipient.isContactRecipient -> {
-                if (recipient.isLocalNumber) return
-                val contacts = configFactory.contacts ?: return
-                contacts.upsertContact(recipient.address.serialize()) { priority = PRIORITY_HIDDEN }
-                ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(context)
-            }
+            // Note: We don't do anything if the thread is a 1-on-1 and the recipient is a contact
+            // of ours (i.e., when recipient.isContactRecipient)
+
             recipient.isClosedGroupRecipient -> {
                 // TODO: handle closed group
                 val volatile = configFactory.convoVolatile ?: return
diff --git a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
index 384f47d4d6..8a7a2dfd0f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
@@ -4,19 +4,14 @@ import network.loki.messenger.libsession_util.util.ExpiryMode
 
 import android.content.ContentResolver
 import android.content.Context
-
 import app.cash.copper.Query
 import app.cash.copper.flow.observeQuery
-
 import dagger.hilt.android.qualifiers.ApplicationContext
-
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
-
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
@@ -32,9 +27,7 @@ import org.session.libsession.utilities.GroupUtil
 import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.recipients.Recipient
 import org.session.libsignal.utilities.Log
-
 import org.session.libsignal.utilities.toHexString
-
 import org.thoughtcrime.securesms.database.DatabaseContentProviders
 import org.thoughtcrime.securesms.database.DraftDatabase
 import org.thoughtcrime.securesms.database.ExpirationConfigurationDatabase
@@ -51,7 +44,6 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.dependencies.ConfigFactory
 import org.thoughtcrime.securesms.dependencies.DatabaseComponent
-
 import javax.inject.Inject
 
 interface ConversationRepository {
@@ -239,7 +231,7 @@ class DefaultConversationRepository @Inject constructor(
                     .success {
                         continuation.resume(ResultOf.Success(Unit))
                     }.fail { error ->
-                        Log.w("[onversationRepository", "Call to SnodeAPI.deleteMessage failed - attempting to resume..")
+                        Log.w("ConversationRepository", "Call to SnodeAPI.deleteMessage failed - attempting to resume..")
                         continuation.resumeWithException(error)
                     }
             }
@@ -330,9 +322,7 @@ class DefaultConversationRepository @Inject constructor(
             while (reader.next != null) {
                 deleteMessageRequest(reader.current)
                 val recipient = reader.current.recipient
-                if (block) {
-                    setBlocked(recipient, true)
-                }
+                if (block) { setBlocked(recipient, true) }
             }
         }
         return ResultOf.Success(Unit)
@@ -359,9 +349,7 @@ class DefaultConversationRepository @Inject constructor(
         val cursor = mmsSmsDb.getConversation(threadId, true)
         mmsSmsDb.readerFor(cursor).use { reader ->
             while (reader.next != null) {
-                if (!reader.current.isOutgoing) {
-                    return true
-                }
+                if (!reader.current.isOutgoing) { return true }
             }
         }
         return false

From 3b3935f9be0b05250be4ee298224463932827e28 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Thu, 18 Apr 2024 14:53:37 +1000
Subject: [PATCH 39/46] Cleanup for PR review

---
 .../conversation/start/ContactListAdapter.kt  |  7 +-----
 .../securesms/database/Storage.kt             |  7 +++---
 .../securesms/database/ThreadDatabase.java    | 22 +++----------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
index 29a94cdcd4..245b14da56 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
@@ -4,15 +4,10 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import network.loki.messenger.R
 import network.loki.messenger.databinding.ContactSectionHeaderBinding
 import network.loki.messenger.databinding.ViewContactBinding
 import org.session.libsession.utilities.recipients.Recipient
-import org.session.libsignal.utilities.Log
-import org.thoughtcrime.securesms.database.Storage
 import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.showSessionDialog
-import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities
 
 sealed class ContactListItem {
     class Header(val name: String) : ContactListItem()
@@ -41,7 +36,7 @@ class ContactListAdapter(
             binding.nameTextView.text = contact.displayName
             binding.root.setOnClickListener { listener(contact.recipient) }
 
-            // TODO: When we implement deleting contacts then probably do it here w/ something like:
+            // TODO: When we implement deleting contacts (hide might be safest) then probably set a long-click listener here w/ something like:
             /*
             binding.root.setOnLongClickListener {
                 Log.w("[ACL]", "Long clicked on contact ${contact.recipient.name}")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 380b816f24..9bc1195f74 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1373,9 +1373,10 @@ open class Storage(
         threadDB.deleteConversation(threadID)
 
         val recipient = getRecipientForThread(threadID)
-        if (recipient == null) { Log.w(TAG, "Got null recipient when deleting conversation - aborting."); return }
-
-        Log.w("[ACL]", "When deleting conversation, recipient is: ${recipient.name}")
+        if (recipient == null) {
+            Log.w(TAG, "Got null recipient when deleting conversation - aborting.");
+            return
+        }
 
         when {
             // Note: We don't do anything if the thread is a 1-on-1 and the recipient is a contact
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
index c8605b1a59..f799a295e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -63,6 +63,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ThreadDatabase extends Database {
 
@@ -187,8 +188,6 @@ public class ThreadDatabase extends Database {
     notifyConversationListListeners();
   }
 
-  // ACL remove unused method
-  /*
   public void updateSnippet(long threadId, String snippet, @Nullable Uri attachment, long date, long type, boolean unarchive) {
     ContentValues contentValues = new ContentValues(4);
 
@@ -207,7 +206,6 @@ public class ThreadDatabase extends Database {
     db.update(TABLE_NAME, contentValues, ID + " = ?", new String[] {threadId + ""});
     notifyConversationListListeners();
   }
-  */
 
   private void deleteThread(long threadId) {
     Recipient recipient = getRecipientForThreadId(threadId);
@@ -220,15 +218,11 @@ public class ThreadDatabase extends Database {
     }
   }
 
-  // ACL remove unused methods
-  /*
   private void deleteThreads(Set<Long> threadIds) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     String where      = "";
 
-    for (long threadId : threadIds) {
-      where += ID + " = '" + threadId + "' OR ";
-    }
+    for (long threadId : threadIds) { where += ID + " = '" + threadId + "' OR "; }
 
     where = where.substring(0, where.length() - 4);
 
@@ -245,7 +239,6 @@ public class ThreadDatabase extends Database {
     addressCache.clear();
     notifyConversationListListeners();
   }
-  */
 
   public void trimAllThreads(int length, ProgressListener listener) {
     Cursor cursor   = null;
@@ -353,17 +346,14 @@ public class ThreadDatabase extends Database {
     }};
   }
 
-  // ACL remove unused method
-  /*
   public void setDistributionType(long threadId, int distributionType) {
     ContentValues contentValues = new ContentValues(1);
-    contentValues.put(CONVERSATION_TYPE, distributionType);
+    contentValues.put(DISTRIBUTION_TYPE, distributionType);
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {threadId + ""});
     notifyConversationListListeners();
   }
-  */
 
   public void setDate(long threadId, long date) {
     ContentValues contentValues = new ContentValues(1);
@@ -622,9 +612,6 @@ public class ThreadDatabase extends Database {
   }
 
   public void deleteConversation(long threadId) {
-
-    Log.w("[ACL]", "Hit ThreadDatabase.deleteConversation");
-
     DatabaseComponent.get(context).smsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).mmsDatabase().deleteThread(threadId);
     DatabaseComponent.get(context).draftDatabase().clearDrafts(threadId);
@@ -736,9 +723,6 @@ public class ThreadDatabase extends Database {
   }
 
   public boolean update(long threadId, boolean unarchive, boolean shouldDeleteOnEmpty) {
-
-    Log.w("[ACL]", "Hit ThreadDatabase.update!");
-
     MmsSmsDatabase mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase();
     long count                    = mmsSmsDatabase.getConversationCount(threadId);
 

From a7e255091bc4d236b532418be3ab802f2b78fd46 Mon Sep 17 00:00:00 2001
From: Al Lansley <al@oxen.io>
Date: Fri, 19 Apr 2024 07:43:15 +1000
Subject: [PATCH 40/46] Implemented PR feedback

---
 .../securesms/database/Storage.kt             | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 9bc1195f74..354ec05c46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1378,25 +1378,22 @@ open class Storage(
             return
         }
 
-        when {
-            // Note: We don't do anything if the thread is a 1-on-1 and the recipient is a contact
-            // of ours (i.e., when recipient.isContactRecipient)
+        // There is nothing further we need to do if this is a 1-on-1 conversation, and it's not
+        // possible to delete communities in this manner so bail.
+        if (recipient.isContactRecipient || recipient.isCommunityRecipient) return
 
-            recipient.isClosedGroupRecipient -> {
-                // TODO: handle closed group
-                val volatile = configFactory.convoVolatile ?: return
-                val groups = configFactory.userGroups ?: return
-                val groupID = recipient.address.toGroupString()
-                val closedGroup = getGroup(groupID)
-                val groupPublicKey = GroupUtil.doubleDecodeGroupId(recipient.address.serialize())
-                if (closedGroup != null) {
-                    groupDB.delete(groupID) // TODO: Should we delete the group? (seems odd to leave it)
-                    volatile.eraseLegacyClosedGroup(groupPublicKey)
-                    groups.eraseLegacyGroup(groupPublicKey)
-                } else {
-                    Log.w("Loki-DBG", "Failed to find a closed group for ${groupPublicKey.take(4)}")
-                }
-            }
+        // If we get here then this is a closed group conversation (i.e., recipient.isClosedGroupRecipient)
+        val volatile = configFactory.convoVolatile ?: return
+        val groups = configFactory.userGroups ?: return
+        val groupID = recipient.address.toGroupString()
+        val closedGroup = getGroup(groupID)
+        val groupPublicKey = GroupUtil.doubleDecodeGroupId(recipient.address.serialize())
+        if (closedGroup != null) {
+            groupDB.delete(groupID)
+            volatile.eraseLegacyClosedGroup(groupPublicKey)
+            groups.eraseLegacyGroup(groupPublicKey)
+        } else {
+            Log.w("Loki-DBG", "Failed to find a closed group for ${groupPublicKey.take(4)}")
         }
     }
 

From 4876523bf24872b35350d7d643715787aa383214 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Mon, 22 Apr 2024 10:00:46 +0930
Subject: [PATCH 41/46] Don't start expiration for group expiration update
 messages

---
 .../thoughtcrime/securesms/service/ExpiringMessageManager.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.kt b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.kt
index c1dff74333..2f6ad7fd8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.kt
@@ -151,8 +151,8 @@ class ExpiringMessageManager(context: Context) : MessageExpirationManagerProtoco
 
         val userPublicKey = getLocalNumber(context)
         val senderPublicKey = message.sender
-        val sentTimestamp = if (message.sentTimestamp == null) 0 else message.sentTimestamp!!
-        val expireStartedAt = if (expiryMode is AfterSend || message.isSenderSelf) sentTimestamp else 0
+        val sentTimestamp = message.sentTimestamp ?: 0
+        val expireStartedAt = if ((expiryMode is AfterSend || message.isSenderSelf) && !message.isGroup) sentTimestamp else 0
 
         // Notify the user
         if (senderPublicKey == null || userPublicKey == senderPublicKey) {

From dbe3834dc174550dfc51ac7c879da4addd6a3aa9 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Mon, 22 Apr 2024 11:58:27 +0930
Subject: [PATCH 42/46] Fix expiry update message for groups

---
 .../libsession/messaging/utilities/UpdateMessageBuilder.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
index ae4c47e10a..5533b236ed 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt
@@ -81,7 +81,7 @@ object UpdateMessageBuilder {
             else context.getString(if (isGroup) R.string.MessageRecord_s_turned_off_disappearing_messages else R.string.MessageRecord_s_turned_off_disappearing_messages_1_on_1, senderName)
         } else {
             val time = ExpirationUtil.getExpirationDisplayValue(context, duration.toInt())
-            val action = context.getExpirationTypeDisplayValue(timestamp == expireStarted)
+            val action = context.getExpirationTypeDisplayValue(timestamp >= expireStarted)
             if (isOutgoing) context.getString(
                 if (isGroup) R.string.MessageRecord_you_set_messages_to_disappear_s_after_s else R.string.MessageRecord_you_set_messages_to_disappear_s_after_s_1_on_1,
                 time,

From 577e86e31fa82fcc2862616468656400446aecd4 Mon Sep 17 00:00:00 2001
From: Andrew <andrewgallasch@gmail.com>
Date: Tue, 23 Apr 2024 13:03:11 +0930
Subject: [PATCH 43/46] Correctly don't start disappear timer on group timer
 updates

---
 .../securesms/notifications/MarkReadReceiver.kt             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
index 9f83726f46..59681c1f8a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.kt
@@ -61,11 +61,15 @@ class MarkReadReceiver : BroadcastReceiver() {
 
             val mmsSmsDatabase = DatabaseComponent.get(context).mmsSmsDatabase()
 
+            val threadDb = DatabaseComponent.get(context).threadDatabase()
+
             // start disappear after read messages except TimerUpdates in groups.
             markedReadMessages
                 .filter { it.expiryType == ExpiryType.AFTER_READ }
                 .map { it.syncMessageId }
-                .filter { mmsSmsDatabase.getMessageForTimestamp(it.timetamp)?.run { isExpirationTimerUpdate && recipient.isClosedGroupRecipient } == false }
+                .filter { mmsSmsDatabase.getMessageForTimestamp(it.timetamp)?.run {
+                    isExpirationTimerUpdate && threadDb.getRecipientForThreadId(threadId)?.isGroupRecipient == true } == false
+                }
                 .forEach { messageExpirationManager.startDisappearAfterRead(it.timetamp, it.address.serialize()) }
 
             hashToDisappearAfterReadMessage(context, markedReadMessages)?.let {

From 629f98dfb42cc4efc05c78e47f4ba793e81e7729 Mon Sep 17 00:00:00 2001
From: AL-Session <160798022+AL-Session@users.noreply.github.com>
Date: Wed, 1 May 2024 11:52:09 +1000
Subject: [PATCH 44/46] SES1813 - Fix regression test failures (#1473)

* Initial fix for regression test failure 1.1

* Added permissions fix for sharing documents which should allow for thumbnail generation

* Minor touch-up prior to merge into dev

* Fixes #1813

* Fixes #1472 - please ignore previous fixes 1813 statement, I'd used the Jira ticket number rather than creating a GitHub issue and using that

---------

Co-authored-by: alansley <aclansley@gmail.com>
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../securesms/calls/WebRtcCallActivity.kt     |  2 ++
 .../conversation/start/ContactListAdapter.kt  |  2 +-
 .../v2/utilities/AttachmentManager.java       | 16 ++++++++++++++-
 .../v2/utilities/MentionUtilities.kt          |  1 +
 .../database/model/DisplayRecord.java         |  4 ++--
 .../notifications/DefaultMessageNotifier.java | 12 ++++++++---
 .../securesms/service/WebRtcCallService.kt    | 20 +++++++------------
 .../securesms/util/ViewUtilities.kt           | 15 +++++++++-----
 .../utilities/TextSecurePreferences.kt        |  2 +-
 10 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 49b968fc89..79d55b37f8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
index 198fc33372..afa6944645 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
@@ -93,6 +93,7 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
         super.onNewIntent(intent)
         if (intent?.action == ACTION_ANSWER) {
             val answerIntent = WebRtcCallService.acceptCallIntent(this)
+            answerIntent.flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
             ContextCompat.startForegroundService(this, answerIntent)
         }
     }
@@ -106,6 +107,7 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
             setShowWhenLocked(true)
             setTurnScreenOn(true)
         }
+
         window.addFlags(
             WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                     or WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
index 245b14da56..df2bc1c371 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/start/ContactListAdapter.kt
@@ -36,7 +36,7 @@ class ContactListAdapter(
             binding.nameTextView.text = contact.displayName
             binding.root.setOnClickListener { listener(contact.recipient) }
 
-            // TODO: When we implement deleting contacts (hide might be safest) then probably set a long-click listener here w/ something like:
+            // TODO: When we implement deleting contacts (hide might be safest for now) then probably set a long-click listener here w/ something like:
             /*
             binding.root.setOnLongClickListener {
                 Log.w("[ACL]", "Long clicked on contact ${contact.recipient.name}")
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
index 088685241c..76b95d7b17 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/AttachmentManager.java
@@ -241,7 +241,21 @@ public class AttachmentManager {
   }
 
   public static void selectDocument(Activity activity, int requestCode) {
-    selectMediaType(activity, "*/*", null, requestCode);
+    Permissions.PermissionsBuilder builder = Permissions.with(activity);
+
+    // The READ_EXTERNAL_STORAGE permission is deprecated (and will AUTO-FAIL if requested!) on
+    // Android 13 and above (API 33 - 'Tiramisu') we must ask for READ_MEDIA_VIDEO/IMAGES/AUDIO instead.
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+      builder = builder.request(Manifest.permission.READ_MEDIA_VIDEO)
+                       .request(Manifest.permission.READ_MEDIA_IMAGES)
+                       .request(Manifest.permission.READ_MEDIA_AUDIO);
+    } else {
+      builder = builder.request(Manifest.permission.READ_EXTERNAL_STORAGE);
+    }
+    builder.withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
+            .withRationaleDialog(activity.getString(R.string.ConversationActivity_to_send_photos_and_video_allow_signal_access_to_storage), R.drawable.ic_baseline_photo_library_24)
+            .onAllGranted(() -> selectMediaType(activity, "*/*", null, requestCode)) // Note: We can use startActivityForResult w/ the ACTION_OPEN_DOCUMENT or ACTION_OPEN_DOCUMENT_TREE intent if we need to modernise this.
+            .execute();
   }
 
   public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull String body) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
index a52d8458f1..cb9a19ffc1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.conversation.v2.utilities
 
+import android.app.Application
 import android.content.Context
 import android.graphics.Typeface
 import android.text.Spannable
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index db1076e472..639ea0db09 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -78,8 +78,8 @@ public abstract class DisplayRecord {
   public int getReadReceiptCount() { return readReceiptCount; }
 
   public boolean isDelivered() {
-    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE
-      && deliveryStatus < SmsDatabase.Status.STATUS_PENDING) || deliveryReceiptCount > 0;
+    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE &&
+            deliveryStatus < SmsDatabase.Status.STATUS_PENDING) || deliveryReceiptCount > 0;
   }
 
   public boolean isSent() { return MmsSmsColumns.Types.isSentType(type); }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 2c70bff637..b281e0798b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -349,11 +349,17 @@ public class DefaultMessageNotifier implements MessageNotifier {
     builder.setThread(notifications.get(0).getRecipient());
     builder.setMessageCount(notificationState.getMessageCount());
     MentionManagerUtilities.INSTANCE.populateUserPublicKeyCacheIfNeeded(notifications.get(0).getThreadId(),context);
+
+    // TODO: Removing highlighting mentions in the notification because this context is the libsession one which
+    // TODO: doesn't have access to the `R.attr.message_sent_text_color` and `R.attr.message_received_text_color`
+    // TODO: attributes to perform the colour lookup. Also, it makes little sense to highlight the mentions using
+    // TODO: the app theme as it may result in insufficient contrast with the notification background which will
+    // TODO: be using the SYSTEM theme.
     builder.setPrimaryMessageBody(recipient, notifications.get(0).getIndividualRecipient(),
-                                  MentionUtilities.highlightMentions(text == null ? "" : text,
-                                          notifications.get(0).getThreadId(),
-                                          context),
+                                  //MentionUtilities.highlightMentions(text == null ? "" : text, notifications.get(0).getThreadId(), context), // Removing hightlighting mentions -ACL
+                                  text == null ? "" : text,
                                   notifications.get(0).getSlideDeck());
+
     builder.setContentIntent(notifications.get(0).getPendingIntent(context));
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
index 3ae3d30f01..cfe1f38f58 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.kt
@@ -182,9 +182,7 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
         }
 
         fun broadcastWantsToAnswer(context: Context, wantsToAnswer: Boolean) {
-            val intent = Intent(ACTION_WANTS_TO_ANSWER)
-                .putExtra(EXTRA_WANTS_TO_ANSWER, wantsToAnswer)
-
+            val intent = Intent(ACTION_WANTS_TO_ANSWER).putExtra(EXTRA_WANTS_TO_ANSWER, wantsToAnswer)
             LocalBroadcastManager.getInstance(context).sendBroadcast(intent)
         }
 
@@ -506,9 +504,9 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
     }
 
     private fun handleAnswerCall(intent: Intent) {
-        val recipient = callManager.recipient ?: return
-        val pending = callManager.pendingOffer ?: return
-        val callId = callManager.callId ?: return
+        val recipient = callManager.recipient    ?: return Log.e(TAG, "No recipient to answer in handleAnswerCall")
+        val pending   = callManager.pendingOffer ?: return Log.e(TAG, "No pending offer in handleAnswerCall")
+        val callId    = callManager.callId       ?: return Log.e(TAG, "No callId in handleAnswerCall")
         val timestamp = callManager.pendingOfferTime
 
         if (callManager.currentConnectionState != CallState.RemoteRing) {
@@ -526,9 +524,7 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
                 insertMissedCall(recipient, true)
                 terminate()
             }
-            if (didHangup) {
-                return
-            }
+            if (didHangup) { return }
         }
 
         callManager.postConnectionEvent(Event.SendAnswer) {
@@ -686,7 +682,6 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
     private fun registerPowerButtonReceiver() {
         if (powerButtonReceiver == null) {
             powerButtonReceiver = PowerButtonReceiver()
-
             registerReceiver(powerButtonReceiver, IntentFilter(Intent.ACTION_SCREEN_OFF))
         }
     }
@@ -719,7 +714,6 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
         }
     }
 
-
     private fun handleCheckTimeout(intent: Intent) {
         val callId = callManager.callId ?: return
         val callState = callManager.currentConnectionState
@@ -746,9 +740,9 @@ class WebRtcCallService : LifecycleService(), CallManager.WebRtcListener {
         }
 
         if (!CallNotificationBuilder.areNotificationsEnabled(this) && type == TYPE_INCOMING_PRE_OFFER) {
-            // start an intent for the fullscreen
+            // Start an intent for the fullscreen call activity
             val foregroundIntent = Intent(this, WebRtcCallActivity::class.java)
-                .setFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_BROUGHT_TO_FRONT)
+                .setFlags(FLAG_ACTIVITY_NEW_TASK or FLAG_ACTIVITY_BROUGHT_TO_FRONT or Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
                 .setAction(WebRtcCallActivity.ACTION_FULL_SCREEN_INTENT)
             startActivity(foregroundIntent)
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
index 9c427e1f86..c0477825fd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt
@@ -19,6 +19,7 @@ import android.view.inputmethod.InputMethodManager
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorRes
 import androidx.core.graphics.applyCanvas
+import org.session.libsignal.utilities.Log
 import kotlin.math.roundToInt
 
 fun View.contains(point: PointF): Boolean {
@@ -38,15 +39,19 @@ fun Context.getAccentColor() = getColorFromAttr(R.attr.colorAccent)
 // Method to grab the appropriate attribute for a message colour.
 // Note: This is an attribute, NOT a resource Id - see `getColorResourceIdFromAttr` for that.
 @AttrRes
-fun getMessageTextColourAttr(messageIsOutgoing: Boolean): Int =
-    if (messageIsOutgoing) R.attr.message_sent_text_color else R.attr.message_received_text_color
+fun getMessageTextColourAttr(messageIsOutgoing: Boolean): Int {
+    return if (messageIsOutgoing) R.attr.message_sent_text_color else R.attr.message_received_text_color
+}
 
 // Method to get an actual R.id.<SOME_COLOUR> resource Id from an attribute such as R.attr.message_sent_text_color etc.
 @ColorRes
 fun getColorResourceIdFromAttr(context: Context, attr: Int): Int {
-    val typedValue = TypedValue()
-    context.theme.resolveAttribute(attr, typedValue, true)
-    return typedValue.resourceId
+    val outTypedValue = TypedValue()
+    val successfullyFoundAttribute = context.theme.resolveAttribute(attr, outTypedValue, true)
+    if (successfullyFoundAttribute) { return outTypedValue.resourceId }
+
+    Log.w("ViewUtils", "Could not find colour attribute $attr in theme - using grey as a safe fallback")
+    return R.color.gray50
 }
 
 fun View.animateSizeChange(@DimenRes startSizeID: Int, @DimenRes endSizeID: Int, animationDuration: Long = 250) {
diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
index 1b431d62bb..af16d93f5a 100644
--- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
+++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
@@ -842,7 +842,7 @@ interface TextSecurePreferences {
             getDefaultSharedPreferences(context).edit().putString(key, value).apply()
         }
 
-        private fun getIntegerPreference(context: Context, key: String, defaultValue: Int): Int {
+        fun getIntegerPreference(context: Context, key: String, defaultValue: Int): Int {
             return getDefaultSharedPreferences(context).getInt(key, defaultValue)
         }
 

From d8daf6175e5723276809fe799e04a1baff5a51de Mon Sep 17 00:00:00 2001
From: AL-Session <160798022+AL-Session@users.noreply.github.com>
Date: Wed, 1 May 2024 20:08:36 +1000
Subject: [PATCH 45/46] Fixes #1476 - Canononical version number needs to be
 bumped to provide new Google Play Store release

Co-authored-by: alansley <aclansley@gmail.com>
---
 app/build.gradle                                           | 2 +-
 .../securesms/conversation/v2/ConversationActivityV2.kt    | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9e231c1bec..ac1b68ae6c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,7 +31,7 @@ configurations.all {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 370
+def canonicalVersionCode = 371
 def canonicalVersionName = "1.18.2"
 
 def postFixSize = 10
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 fc6fb03e1e..84f43e014b 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
@@ -252,7 +252,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         viewModelFactory.create(threadId, MessagingModuleConfiguration.shared.getUserED25519KeyPair())
     }
     private var actionMode: ActionMode? = null
-    private var unreadCount = 0
+    private var unreadCount = Int.MAX_VALUE
     // Attachments
     private val audioRecorder = AudioRecorder(this)
     private val stopAudioHandler = Handler(Looper.getMainLooper())
@@ -572,10 +572,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         binding!!.conversationRecyclerView.layoutManager = layoutManager
         // Workaround for the fact that CursorRecyclerViewAdapter doesn't auto-update automatically (even though it says it will)
         LoaderManager.getInstance(this).restartLoader(0, null, this)
-        binding!!.conversationRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        binding!!.conversationRecyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() { 
 
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                if (recyclerScrollState == RecyclerView.SCROLL_STATE_IDLE) {
+                // The unreadCount check is to prevent us scrolling to the bottom when we first enter a conversation
+                if (recyclerScrollState == RecyclerView.SCROLL_STATE_IDLE && unreadCount != Int.MAX_VALUE) {
                     scrollToMostRecentMessageIfWeShould()
                 }
                 handleRecyclerViewScrolled()

From fbc82d783184cbe24eae53dffc7199a5889f28bf Mon Sep 17 00:00:00 2001
From: AL-Session <160798022+AL-Session@users.noreply.github.com>
Date: Thu, 2 May 2024 12:55:24 +1000
Subject: [PATCH 46/46] SES1628 - Add git commit details to version info
 (#1459)

* Fixes #1458

* Addressed PR feedback
---
 app/build.gradle                                     | 12 ++++++++++++
 .../securesms/preferences/SettingsActivity.kt        |  5 ++++-
 app/src/main/res/values-fa/strings.xml               |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ac1b68ae6c..5016a1fded 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,17 @@ def abiPostFix = ['armeabi-v7a' : 1,
                   'x86_64'      : 4,
                   'universal'   : 5]
 
+// Function to get the current git commit hash so we can embed it along w/ the build version.
+// Note: This is visible in the SettingsActivity, right at the bottom (R.id.versionTextView).
+def getGitHash = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine "git", "rev-parse", "--short", "HEAD"
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
 android {
     compileSdkVersion androidCompileSdkVersion
     namespace 'network.loki.messenger'
@@ -94,6 +105,7 @@ android {
         project.ext.set("archivesBaseName", "session")
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
+        buildConfigField "String", "GIT_HASH", "\"$getGitHash\""
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "USER_AGENT", "\"OWA\""
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
index 2a45d596d6..b66df5d255 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt
@@ -37,6 +37,7 @@ import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.utilities.*
 import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol
 import org.session.libsession.utilities.recipients.Recipient
+import org.session.libsignal.utilities.getProperty
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.avatar.AvatarSelection
 import org.thoughtcrime.securesms.components.ProfilePictureView
@@ -107,7 +108,9 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
             helpButton.setOnClickListener { showHelp() }
             seedButton.setOnClickListener { showSeed() }
             clearAllDataButton.setOnClickListener { clearAllData() }
-            versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+
+            val gitCommitFirstSixChars = BuildConfig.GIT_HASH.take(6)
+            versionTextView.text = String.format(getString(R.string.version_s), "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE} - $gitCommitFirstSixChars)")
         }
     }
 
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0aa6b5a88d..d9d26e6625 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -7,7 +7,7 @@
     <string name="ban">مسدود</string>
     <string name="save">ذخیره</string>
     <string name="note_to_self">یادداشت به خود</string>
-    <string name="version_s">نسخه</string>
+    <string name="version_s">%s نسخه</string>
     <!-- AbstractNotificationBuilder -->
     <string name="AbstractNotificationBuilder_new_message">پیام جدید</string>
     <!-- AlbumThumbnailView -->