Merge branch 'dev' into bug-fix-for-call

Session/Conversations/Message Cells/Content Views/LinkPreviewView.swift

@@ -9,7 +9,7 @@ final class LinkPreviewView : UIView {
     private lazy var imageViewContainerHeightConstraint = imageView.set(.height, to: 100)
 
     private lazy var sentLinkPreviewTextColor: UIColor = {
-        let isOutgoing = (viewItem!.interaction.interactionType() == .outgoingMessage)
+        let isOutgoing = (viewItem?.interaction.interactionType() == .outgoingMessage)
         switch (isOutgoing, AppModeManager.shared.currentAppMode) {
         case (true, .dark), (false, .light): return .black
         case (true, .light): return Colors.grey

Session/Home/HomeVC.swift

@@ -84,6 +84,12 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
     // MARK: Lifecycle
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        // Note: This is a hack to ensure `isRTL` is initially gets run on the main thread so the value is cached (it gets
+        // called on background threads and if it hasn't cached the value then it can cause odd performance issues since
+        // it accesses UIKit)
+        _ = CurrentAppContext().isRTL
+        
         // Threads (part 1)
         dbConnection.beginLongLivedReadTransaction() // Freeze the connection for use on the main thread (this gives us a stable data source that doesn't change until we tell it to)
         // Preparation

Session/Meta/MainAppContext.m

@@ -166,6 +166,7 @@ NSString *const ReportedApplicationStateDidChangeNotification = @"ReportedApplic
 
 - (BOOL)isRTL
 {
+    // FIXME: We should try to remove this as we've had to add a hack to ensure the first call to this runs on the main thread
     static BOOL isRTL = NO;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{

SessionShareExtension/ThreadPickerVC.swift

@@ -162,7 +162,7 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
         message.sentTimestamp = NSDate.millisecondTimestamp()
         message.text = (isSharingUrl && (messageText?.isEmpty == true || attachments[0].linkPreviewDraft == nil) ?
             (
-                (messageText?.isEmpty == true ?
+                (messageText?.isEmpty == true || (attachments[0].text() == messageText) ?
                     attachments[0].text() :
                     "\(attachments[0].text() ?? "")\n\n\(messageText ?? "")"
                 )