From 00dedae3e069372af0aebc42ad7a65135a5e851a Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Sat, 19 Mar 2022 11:41:36 -0700
Subject: [PATCH 1/3] Fix 1:1 sharing suggestions

---
 SignalMessaging/utils/ThreadUtil.swift | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/SignalMessaging/utils/ThreadUtil.swift b/SignalMessaging/utils/ThreadUtil.swift
index b2f388173f..f0d4b718e1 100644
--- a/SignalMessaging/utils/ThreadUtil.swift
+++ b/SignalMessaging/utils/ThreadUtil.swift
@@ -158,23 +158,34 @@ extension TSThread {
 
         let senderAddress: SignalServiceAddress
         let message: TSMessage?
+        let recipients: [INPerson]?
         switch context {
         case .outgoingMessage(let outgoingMessage):
             senderAddress = localAddress
             message = outgoingMessage
+
+            // For 1:1 outgoing messages, we must populate the recipient of the message,
+            // otherwise sharing suggestions won't be populated correctly.
+            if !isGroupThread {
+                recipients = outgoingMessage.recipientAddresses().map { inPersonForRecipient($0, transaction: transaction) }
+            } else {
+                recipients = nil
+            }
         case .incomingMessage(let incomingMessage):
             senderAddress = incomingMessage.authorAddress
             message = incomingMessage
+            recipients = nil
         case .senderAddress(let address):
             senderAddress = address
             message = nil
+            recipients = nil
         }
 
         let threadName = contactsManager.displayName(for: self, transaction: transaction)
         let inSender = inPersonForRecipient(senderAddress, transaction: transaction)
 
         let sendMessageIntent = INSendMessageIntent(
-            recipients: nil,
+            recipients: recipients,
             outgoingMessageType: .outgoingMessageText,
             content: nil,
             speakableGroupName: isGroupThread ? INSpeakableString(spokenPhrase: threadName) : nil,

From 9568f2a9cf556c88f555d9deea8d5ef6e255ef99 Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Sat, 19 Mar 2022 11:41:46 -0700
Subject: [PATCH 2/3] "Feature flags for .beta."

---
 SignalServiceKit/src/Util/FeatureFlags.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift
index d68da2711e..16cf1a6757 100644
--- a/SignalServiceKit/src/Util/FeatureFlags.swift
+++ b/SignalServiceKit/src/Util/FeatureFlags.swift
@@ -19,7 +19,7 @@ extension FeatureBuild {
     }
 }
 
-private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .qa
+private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .beta
 
 // MARK: -
 

From 375dcdc81e346515194acb9b63e2ecfacf292488 Mon Sep 17 00:00:00 2001
From: Nora Trapp <nora@signal.org>
Date: Sat, 19 Mar 2022 11:41:46 -0700
Subject: [PATCH 3/3] "Bump build to 5.33.0.24." (Beta)

---
 Signal/Signal-Info.plist        | 4 ++--
 SignalNSE/Info.plist            | 4 ++--
 SignalShareExtension/Info.plist | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index 528095c620..e7495a3cbc 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -43,7 +43,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LOGS_EMAIL</key>
@@ -141,7 +141,7 @@
 		<string>INStartCallIntent</string>
 	</array>
 	<key>OWSBundleVersion4</key>
-	<string>5.33.0.23</string>
+	<string>5.33.0.24</string>
 	<key>PHPhotoLibraryPreventAutomaticLimitedAccessAlert</key>
 	<true/>
 	<key>UIApplicationShortcutItems</key>
diff --git a/SignalNSE/Info.plist b/SignalNSE/Info.plist
index 14e862bf99..5e1c253735 100644
--- a/SignalNSE/Info.plist
+++ b/SignalNSE/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>5.33.0</string>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSExceptionDomains</key>
@@ -55,6 +55,6 @@
 		<string>$(PRODUCT_MODULE_NAME).NotificationService</string>
 	</dict>
 	<key>OWSBundleVersion4</key>
-	<string>5.33.0.23</string>
+	<string>5.33.0.24</string>
 </dict>
 </plist>
diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist
index dc1aaf705e..e5f88ecf95 100644
--- a/SignalShareExtension/Info.plist
+++ b/SignalShareExtension/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>5.33.0</string>
 	<key>CFBundleVersion</key>
-	<string>23</string>
+	<string>24</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>
@@ -77,7 +77,7 @@
 		<string>com.apple.share-services</string>
 	</dict>
 	<key>OWSBundleVersion4</key>
-	<string>5.33.0.23</string>
+	<string>5.33.0.24</string>
 	<key>UIStatusBarStyle</key>
 	<string>UIStatusBarStyleLightContent</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>