From 47d1c657f34a4edd9ec169bf94988556b1e99270 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Thu, 20 Jul 2023 13:21:58 +0930
Subject: [PATCH 1/3] Enable reply with attachment

---
 .../securesms/conversation/v2/ConversationActivityV2.kt    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 e7b1945498..0864a570ae 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
@@ -1606,7 +1606,12 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
         return Pair(recipient.address, sentTimestamp)
     }
 
-    private fun sendAttachments(attachments: List<Attachment>, body: String?, quotedMessage: MessageRecord? = null, linkPreview: LinkPreview? = null): Pair<Address, Long>? {
+    private fun sendAttachments(
+        attachments: List<Attachment>,
+        body: String?,
+        quotedMessage: MessageRecord? = binding?.inputBar?.quote,
+        linkPreview: LinkPreview? = null
+    ): Pair<Address, Long>? {
         val recipient = viewModel.recipient ?: return null
         val sentTimestamp = SnodeAPI.nowWithOffset
         processMessageRequestApproval()

From b25f0e6d27a6b68bd82ff9129814d8483f637320 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Thu, 20 Jul 2023 13:22:52 +0930
Subject: [PATCH 2/3] Move voice below quote in message view

---
 .../layout/view_visible_message_content.xml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/res/layout/view_visible_message_content.xml b/app/src/main/res/layout/view_visible_message_content.xml
index e897bcea58..2c56229a8a 100644
--- a/app/src/main/res/layout/view_visible_message_content.xml
+++ b/app/src/main/res/layout/view_visible_message_content.xml
@@ -36,15 +36,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
-        <include layout="@layout/view_voice_message"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:visibility="gone"
-            android:id="@+id/voiceMessageView"
-            android:layout_width="160dp"
-            android:layout_height="36dp"/>
-
         <include layout="@layout/view_open_group_invitation"
             tools:visibility="gone"
             app:layout_constraintTop_toTopOf="parent"
@@ -75,6 +66,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
+        <include layout="@layout/view_voice_message"
+            app:layout_constraintTop_toBottomOf="@id/quoteView"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            android:visibility="gone"
+            android:id="@+id/voiceMessageView"
+            android:layout_width="160dp"
+            android:layout_height="36dp"/>
+
         <include layout="@layout/view_link_preview"
             app:layout_constraintTop_toBottomOf="@+id/quoteView"
             app:layout_constraintStart_toStartOf="parent"

From 0cd0ac9c754666b670a0e9261c33ef48a9797183 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Thu, 21 Sep 2023 19:44:54 +0930
Subject: [PATCH 3/3] Ignore unknown fields in push V2 json

---
 .../org/thoughtcrime/securesms/notifications/PushReceiver.kt  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
index 3982113985..7fb9c12ab4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushReceiver.kt
@@ -10,6 +10,7 @@ import com.goterl.lazysodium.utils.Key
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonBuilder
 import org.session.libsession.messaging.jobs.BatchMessageReceiveJob
 import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.messaging.jobs.MessageReceiveParameters
@@ -28,6 +29,7 @@ private const val TAG = "PushHandler"
 
 class PushReceiver @Inject constructor(@ApplicationContext val context: Context) {
     private val sodium = LazySodiumAndroid(SodiumAndroid())
+    private val json = Json { ignoreUnknownKeys = true }
 
     fun onPush(dataMap: Map<String, String>?) {
         onPush(dataMap?.asByteArray())
@@ -89,7 +91,7 @@ class PushReceiver @Inject constructor(@ApplicationContext val context: Context)
             ?: error("Failed to decode bencoded list from payload")
 
         val metadataJson = (expectedList[0] as? BencodeString)?.value ?: error("no metadata")
-        val metadata: PushNotificationMetadata = Json.decodeFromString(String(metadataJson))
+        val metadata: PushNotificationMetadata = json.decodeFromString(String(metadataJson))
 
         return (expectedList.getOrNull(1) as? BencodeString)?.value.also {
             // null content is valid only if we got a "data_too_long" flag