Session Pro Badge

Session/Closed Groups/EditGroupViewModel.swift

@@ -300,7 +300,11 @@ class EditGroupViewModel: SessionTableViewModel, NavigatableStateHolder, Observa
                                 font: .title,
                                 accessibility: Accessibility(
                                     identifier: "Contact"
-                                )
+                                ),
+                                trailingImage: {
+                                    guard (dependencies.mutate(cache: .libSession) { $0.validateProProof(for: memberInfo.profile) }) else { return nil }
+                                    return ("ProBadge", { [dependencies] in SessionProBadge(size: .small).toImage(using: dependencies) })
+                                }()
                             ),
                             subtitle: (!isUpdatedGroup ? nil : SessionCell.TextInfo(
                                 memberInfo.value.statusDescription,

Session/Conversations/Context Menu/ContextMenuVC+Action.swift

@@ -66,7 +66,7 @@ extension ContextMenuVC {
 
         static func retry(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
-                icon: UIImage(systemName: "arrow.triangle.2.circlepath"),
+                icon: Lucide.image(icon: .repeat2, size: 24),
                 title: (cellViewModel.state == .failedToSync ?
                     "resync".localized() :
                     "resend".localized()
@@ -77,25 +77,25 @@ extension ContextMenuVC {
 
         static func reply(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
-                icon: UIImage(named: "ic_reply"),
+                icon: Dependencies.isRTL ? Lucide.image(icon: .reply, size: 24)?.flippedHorizontally() : Lucide.image(icon: .reply, size: 24),
                 title: "reply".localized(),
                 shouldDismissInfoScreen: true,
                 accessibilityLabel: "Reply to message"
             ) { completion in delegate?.reply(cellViewModel, completion: completion) }
         }
 
-        static func copy(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
+        static func copy(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?, forMessageInfoScreen: Bool) -> Action {
             return Action(
-                icon: UIImage(named: "ic_copy"),
-                title: "copy".localized(),
+                icon: Lucide.image(icon: .copy, size: 24),
+                title: forMessageInfoScreen ? "messageCopy".localized() : "copy".localized(),
                 feedback: "copied".localized(),
                 accessibilityLabel: "Copy text"
             ) { completion in delegate?.copy(cellViewModel, completion: completion) }
         }
 
         static func copySessionID(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
-                icon: UIImage(named: "ic_copy"),
+                icon: Lucide.image(icon: .copy, size: 24),
                 title: "accountIDCopy".localized(),
                 feedback: "copied".localized(),
                 accessibilityLabel: "Copy Session ID"
@@ -118,7 +118,7 @@ extension ContextMenuVC {
 
         static func save(_ cellViewModel: MessageViewModel, _ delegate: ContextMenuActionDelegate?) -> Action {
             return Action(
-                icon: UIImage(named: "ic_download"),
+                icon: Lucide.image(icon: .arrowDownToLine, size: 24),
                 title: "save".localized(),
                 feedback: "saved".localized(),
                 accessibilityLabel: "Save attachment"
@@ -251,7 +251,8 @@ extension ContextMenuVC {
         }()
         let canCopySessionId: Bool = (
             cellViewModel.variant == .standardIncoming &&
-            cellViewModel.threadVariant != .community
+            cellViewModel.threadVariant != .community &&
+            !forMessageInfoScreen
         )
         let canDelete: Bool = (MessageViewModel.DeletionBehaviours.deletionActions(
             for: [cellViewModel],
@@ -291,7 +292,7 @@ extension ContextMenuVC {
         let generatedActions: [Action] = [
             (canRetry ? Action.retry(cellViewModel, delegate) : nil),
             (viewModelCanReply(cellViewModel, using: dependencies) ? Action.reply(cellViewModel, delegate) : nil),
-            (canCopy ? Action.copy(cellViewModel, delegate) : nil),
+            (canCopy ? Action.copy(cellViewModel, delegate, forMessageInfoScreen: forMessageInfoScreen) : nil),
             (canSave ? Action.save(cellViewModel, delegate) : nil),
             (canCopySessionId ? Action.copySessionID(cellViewModel, delegate) : nil),
             (canDelete ? Action.delete(cellViewModel, delegate) : nil),

Session/Conversations/Context Menu/ContextMenuVC.swift

@@ -143,7 +143,7 @@ final class ContextMenuVC: UIViewController {
         emojiBarBackgroundView.pin(to: emojiBar)
 
         emojiBar.addSubview(emojiPlusButton)
-        emojiPlusButton.pin(.right, to: .right, of: emojiBar, withInset: -Values.smallSpacing)
+        emojiPlusButton.pin(.trailing, to: .trailing, of: emojiBar, withInset: -Values.smallSpacing)
         emojiPlusButton.center(.vertical, in: emojiBar)
 
         let emojiBarStackView = UIStackView(
@@ -156,8 +156,8 @@ final class ContextMenuVC: UIViewController {
         emojiBarStackView.layoutMargins = UIEdgeInsets(top: 0, left: Values.smallSpacing, bottom: 0, right: Values.smallSpacing)
         emojiBarStackView.isLayoutMarginsRelativeArrangement = true
         emojiBar.addSubview(emojiBarStackView)
-        emojiBarStackView.pin([ UIView.HorizontalEdge.left, UIView.VerticalEdge.top, UIView.VerticalEdge.bottom ], to: emojiBar)
-        emojiBarStackView.pin(.right, to: .left, of: emojiPlusButton)
+        emojiBarStackView.pin([ UIView.HorizontalEdge.leading, UIView.VerticalEdge.top, UIView.VerticalEdge.bottom ], to: emojiBar)
+        emojiBarStackView.pin(.trailing, to: .leading, of: emojiPlusButton)
 
         // Hide the emoji bar if we have no emoji actions
         emojiBar.isHidden = emojiBarStackView.arrangedSubviews.isEmpty
@@ -188,25 +188,25 @@ final class ContextMenuVC: UIViewController {
         timestampLabel.center(.vertical, in: snapshot)
 
         if cellViewModel.variant == .standardOutgoing {
-            timestampLabel.pin(.right, to: .left, of: snapshot, withInset: -Values.smallSpacing)
+            timestampLabel.pin(.trailing, to: .leading, of: snapshot, withInset: -Values.smallSpacing)
         }
         else {
-            timestampLabel.pin(.left, to: .right, of: snapshot, withInset: Values.smallSpacing)
+            timestampLabel.pin(.leading, to: .trailing, of: snapshot, withInset: Values.smallSpacing)
         }
 
         view.addSubview(fallbackTimestampLabel)
         fallbackTimestampLabel.pin(.top, to: .top, of: menuView)
         fallbackTimestampLabel.set(.height, to: ContextMenuVC.actionViewHeight)
 
         if cellViewModel.variant == .standardOutgoing {
-            fallbackTimestampLabel.textAlignment = .right
-            fallbackTimestampLabel.pin(.right, to: .left, of: menuView, withInset: -Values.mediumSpacing)
-            fallbackTimestampLabel.pin(.left, to: .left, of: view, withInset: Values.mediumSpacing)
+            fallbackTimestampLabel.textAlignment = Dependencies.isRTL ? .left : .right
+            fallbackTimestampLabel.pin(.trailing, to: .leading, of: menuView, withInset: -Values.mediumSpacing)
+            fallbackTimestampLabel.pin(.leading, to: .leading, of: view, withInset: Values.mediumSpacing)
         }
         else {
-            fallbackTimestampLabel.textAlignment = .left
-            fallbackTimestampLabel.pin(.left, to: .right, of: menuView, withInset: Values.mediumSpacing)
-            fallbackTimestampLabel.pin(.right, to: .right, of: view, withInset: -Values.mediumSpacing)
+            fallbackTimestampLabel.textAlignment = Dependencies.isRTL ? .right : .left
+            fallbackTimestampLabel.pin(.leading, to: .trailing, of: menuView, withInset: Values.mediumSpacing)
+            fallbackTimestampLabel.pin(.trailing, to: .trailing, of: view, withInset: -Values.mediumSpacing)
         }
 
         // Constrains
@@ -219,9 +219,15 @@ final class ContextMenuVC: UIViewController {
         self.timestampLabel.isHidden = {
             switch cellViewModel.variant {
                 case .standardOutgoing:
+                    if Dependencies.isRTL {
+                        return ((self.targetFrame.maxX + timestampSize.width + Values.mediumSpacing) > UIScreen.main.bounds.width)
+                    }
                     return ((self.targetFrame.minX - timestampSize.width - Values.mediumSpacing) < 0)
 
                 default:
+                    if Dependencies.isRTL {
+                        return ((self.targetFrame.minX - timestampSize.width - Values.mediumSpacing) < 0)
+                    }
                     return ((self.targetFrame.maxX + timestampSize.width + Values.mediumSpacing) > UIScreen.main.bounds.width)
             }
         }()
@@ -234,15 +240,18 @@ final class ContextMenuVC: UIViewController {
 
         switch cellViewModel.variant {
             case .standardOutgoing, .standardOutgoingDeleted, .standardOutgoingDeletedLocally:
-                menuView.pin(.right, to: .right, of: view, withInset: -(UIScreen.main.bounds.width - targetFrame.maxX))
-                emojiBar.pin(.right, to: .right, of: view, withInset: -(UIScreen.main.bounds.width - targetFrame.maxX))
+                let inset: CGFloat = Dependencies.isRTL ? -targetFrame.minX : -(UIScreen.main.bounds.width - targetFrame.maxX)
+                menuView.pin(.trailing, to: .trailing, of: view, withInset: inset)
+                emojiBar.pin(.trailing, to: .trailing, of: view, withInset: inset)
 
             case .standardIncoming, .standardIncomingDeleted, .standardIncomingDeletedLocally:
-                menuView.pin(.left, to: .left, of: view, withInset: targetFrame.minX)
-                emojiBar.pin(.left, to: .left, of: view, withInset: targetFrame.minX)
+                let inset: CGFloat = Dependencies.isRTL ? (UIScreen.main.bounds.width - targetFrame.maxX) : targetFrame.minX
+                menuView.pin(.leading, to: .leading, of: view, withInset: inset)
+                emojiBar.pin(.leading, to: .leading, of: view, withInset: inset)
 
             default:    // Should generally only be the 'delete' action
-                menuView.pin(.left, to: .left, of: view, withInset: targetFrame.minX)
+                let inset: CGFloat = Dependencies.isRTL ? (UIScreen.main.bounds.width - targetFrame.maxX) : targetFrame.minX
+                menuView.pin(.leading, to: .leading, of: view, withInset: inset)
         }
 
         // Tap gesture
@@ -281,10 +290,7 @@ final class ContextMenuVC: UIViewController {
             initialSpringVelocity: 0.6,
             options: .curveEaseInOut,
             animations: { [weak self] in
-                self?.snapshot.pin(.left, to: .left, of: view, withInset: targetFrame.origin.x)
-                self?.snapshot.pin(.top, to: .top, of: view, withInset: targetFrame.origin.y)
-                self?.snapshot.set(.width, to: targetFrame.width)
-                self?.snapshot.set(.height, to: targetFrame.height)
+                self?.snapshot.frame = targetFrame
                 self?.snapshot.superview?.setNeedsLayout()
                 self?.snapshot.superview?.layoutIfNeeded()
             },

Session/Conversations/ConversationVC+Interaction.swift

@@ -652,7 +652,7 @@ extension ConversationVC:
             for: snInputView.text.trimmingCharacters(in: .whitespacesAndNewlines),
             isSessionPro: viewModel.isCurrentUserSessionPro
         ) >= 0 else {
-            showModalForMessagesExceedingCharacterLimit(isSessionPro: viewModel.isCurrentUserSessionPro)
+            showModalForMessagesExceedingCharacterLimit(viewModel.isCurrentUserSessionPro)
             return
         }
 
@@ -663,7 +663,7 @@ extension ConversationVC:
         )
     }
 
-    @MainActor func showModalForMessagesExceedingCharacterLimit(isSessionPro: Bool) {
+    @MainActor func showModalForMessagesExceedingCharacterLimit(_ isSessionPro: Bool) {
         guard !viewModel.dependencies[singleton: .sessionProState].showSessionProCTAIfNeeded(
             .longerMessages,
             beforePresented: { [weak self] in
@@ -1667,6 +1667,11 @@ extension ConversationVC:
                 dependencies[singleton: .storage].read { db in try? Profile.fetchOne(db, id: sessionId) }
             )
 
+            let isCurrentUser: Bool = (viewModel.threadData.currentUserSessionIds?.contains(sessionId) == true)
+            guard !isCurrentUser else {
+                return ("you".localized(), "you".localized())
+            }
+
             return (
                 (profile?.displayName(for: .contact) ?? cellViewModel.authorNameSuppressedId),
                 profile?.displayName(for: .contact, ignoringNickname: true)
@@ -2355,6 +2360,14 @@ extension ConversationVC:
         let messageInfoViewController = MessageInfoViewController(
             actions: actions,
             messageViewModel: finalCellViewModel,
+            threadCanWrite: (viewModel.threadData.threadCanWrite == true),
+            onStartThread: { [weak self] in
+                self?.startThread(
+                    with: cellViewModel.authorId,
+                    openGroupServer: cellViewModel.threadOpenGroupServer,
+                    openGroupPublicKey: cellViewModel.threadOpenGroupPublicKey
+                )
+            },
             using: viewModel.dependencies
         )
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { [weak self] in
@@ -2906,11 +2919,14 @@ extension ConversationVC:
 
     func startVoiceMessageRecording() {
         // Request permission if needed
-        Permissions.requestMicrophonePermissionIfNeeded(using: viewModel.dependencies) { [weak self] in
-            DispatchQueue.main.async {
-                self?.cancelVoiceMessageRecording()
+        Permissions.requestMicrophonePermissionIfNeeded(
+            using: viewModel.dependencies,
+            onNotGranted: { [weak self] in
+                DispatchQueue.main.async {
+                    self?.cancelVoiceMessageRecording()
+                }
             }
-        }
+        )
 
         // Keep screen on
         UIApplication.shared.isIdleTimerDisabled = false

Session/Conversations/ConversationVC.swift

@@ -461,7 +461,8 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
         titleView.initialSetup(
             with: self.viewModel.initialThreadVariant,
             isNoteToSelf: self.viewModel.threadData.threadIsNoteToSelf,
-            isMessageRequest: (self.viewModel.threadData.threadIsMessageRequest == true)
+            isMessageRequest: (self.viewModel.threadData.threadIsMessageRequest == true),
+            isSessionPro: self.viewModel.threadData.isSessionPro(using: self.viewModel.dependencies)
         )
 
         // Constraints
@@ -796,6 +797,7 @@ final class ConversationVC: BaseVC, LibSessionRespondingViewController, Conversa
                 with: updatedThreadData.displayName,
                 isNoteToSelf: updatedThreadData.threadIsNoteToSelf,
                 isMessageRequest: (updatedThreadData.threadIsMessageRequest == true),
+                isSessionPro: updatedThreadData.isSessionPro(using: viewModel.dependencies),
                 threadVariant: updatedThreadData.threadVariant,
                 mutedUntilTimestamp: updatedThreadData.threadMutedUntilTimestamp,
                 onlyNotifyForMentions: (updatedThreadData.threadOnlyNotifyForMentions == true),

Session/Conversations/ConversationViewModel.swift

@@ -746,7 +746,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             ),
             expiresInSeconds: threadData.disappearingMessagesConfiguration?.expiresInSeconds(),
             linkPreviewUrl: linkPreviewDraft?.urlString,
-            isProMessage: dependencies[cache: .libSession].isSessionPro,
+            isProMessage: (text.defaulting(to: "").utf16.count > LibSession.CharacterLimit),
             using: dependencies
         )
         var optimisticAttachments: [Attachment]?
@@ -784,6 +784,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate, NavigatableStateHold
             body: interaction.body,
             expiresStartedAtMs: interaction.expiresStartedAtMs,
             expiresInSeconds: interaction.expiresInSeconds,
+            isProMessage: interaction.isProMessage,
             isSenderModeratorOrAdmin: {
                 switch threadData.threadVariant {
                     case .group, .legacyGroup:

Session/Conversations/Input View/InputView.swift

@@ -189,7 +189,7 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M
     }()
 
     private lazy var sessionProBadge: SessionProBadge = {
-        let result: SessionProBadge = SessionProBadge(size: .small)
+        let result: SessionProBadge = SessionProBadge(size: .medium)
         result.isHidden = !dependencies[feature: .sessionProEnabled] || dependencies[cache: .libSession].isSessionPro
 
         return result

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

@@ -86,6 +86,7 @@ final class LinkPreviewView: UIView {
     }()
 
     var bodyTappableLabel: TappableLabel?
+    var bodyTappableLabelHeight: CGFloat = 0
 
     // MARK: - Initialization
 
@@ -222,18 +223,22 @@ final class LinkPreviewView: UIView {
         bodyTappableLabelContainer.subviews.forEach { $0.removeFromSuperview() }
 
         if let cellViewModel: MessageViewModel = cellViewModel {
-            let bodyTappableLabel = VisibleMessageCell.getBodyTappableLabel(
+            let (bodyTappableLabel, height) = VisibleMessageCell.getBodyTappableLabel(
                 for: cellViewModel,
                 with: maxWidth,
                 textColor: (bodyLabelTextColor ?? .textPrimary),
                 searchText: lastSearchText,
                 delegate: delegate,
                 using: dependencies
-            ).label
+            )
 
             self.bodyTappableLabel = bodyTappableLabel
+            self.bodyTappableLabelHeight = height
             bodyTappableLabelContainer.addSubview(bodyTappableLabel)
-            bodyTappableLabel.pin(to: bodyTappableLabelContainer, withInset: 12)
+            bodyTappableLabel.pin(.leading, to: .leading, of: bodyTappableLabelContainer, withInset: 12)
+            bodyTappableLabel.pin(.top, to: .top, of: bodyTappableLabelContainer, withInset: 12)
+            bodyTappableLabel.pin(.trailing, to: .trailing, of: bodyTappableLabelContainer, withInset: -12)
+            bodyTappableLabel.pin(.bottom, to: .bottom, of: bodyTappableLabelContainer)
         }
 
         if state is LinkPreview.DraftState {