From bc5d8d0931d4e24aedbece642aa26ddd3015eded Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 14 Jul 2023 14:36:59 +1000 Subject: [PATCH 1/3] Cleaning up final things before release Added basic support for the '25' blinded prefix Fixed a unit test CI issue --- .../Context Menu/ContextMenuVC+Action.swift | 6 +- .../ConversationVC+Interaction.swift | 8 ++- Session/Conversations/ConversationVC.swift | 5 +- .../Conversations/ConversationViewModel.swift | 65 ++++++++++++------- .../Conversations/Input View/InputView.swift | 3 +- .../Content Views/QuoteView.swift | 15 +++-- .../Message Cells/VisibleMessageCell.swift | 11 +++- Session/Home/HomeVC.swift | 6 +- Session/Home/HomeViewModel.swift | 9 ++- .../MessageRequestsViewModel.swift | 9 ++- Session/Home/New Conversation/NewDMVC.swift | 4 +- Session/Notifications/AppNotifications.swift | 14 +++- Session/Shared/FullConversationCell.swift | 18 +++-- Session/Utilities/MentionUtilities.swift | 12 ++-- .../Database/Models/Interaction.swift | 5 +- .../Database/Models/SessionThread.swift | 7 +- .../Messages/Message+Destination.swift | 4 +- SessionMessagingKit/Messages/Message.swift | 19 +++++- .../Open Groups/Models/SOGSMessage.swift | 2 +- .../Open Groups/OpenGroupAPI.swift | 2 +- .../Open Groups/OpenGroupManager.swift | 18 +++-- ...essageReceiver+ConfigurationMessages.swift | 2 +- .../MessageReceiver+MessageRequests.swift | 5 +- .../MessageReceiver+VisibleMessages.swift | 9 ++- .../Sending & Receiving/MessageReceiver.swift | 2 +- .../MessageSender+Encryption.swift | 7 +- .../Sending & Receiving/MessageSender.swift | 2 +- .../Quotes/QuotedReplyModel.swift | 15 +++-- .../SessionUtil+Contacts.swift | 3 +- .../Shared Models/MentionInfo.swift | 10 +-- .../Shared Models/MessageViewModel.swift | 32 ++++++--- .../SessionThreadViewModel.swift | 30 ++++++--- .../Utilities/Sodium+Utilities.swift | 19 ++++-- SessionUtilitiesKit/General/SessionId.swift | 3 +- .../General/SessionIdSpec.swift | 7 +- _SharedTestUtilities/MockGeneralCache.swift | 2 - 36 files changed, 263 insertions(+), 127 deletions(-) diff --git a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift index bcef043e3..f71cfde88 100644 --- a/Session/Conversations/Context Menu/ContextMenuVC+Action.swift +++ b/Session/Conversations/Context Menu/ContextMenuVC+Action.swift @@ -146,7 +146,8 @@ extension ContextMenuVC { for cellViewModel: MessageViewModel, recentEmojis: [EmojiWithSkinTones], currentUserPublicKey: String, - currentUserBlindedPublicKey: String?, + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String?, currentUserIsOpenGroupModerator: Bool, currentThreadIsMessageRequest: Bool, delegate: ContextMenuActionDelegate? @@ -204,7 +205,8 @@ extension ContextMenuVC { cellViewModel.threadVariant != .community || currentUserIsOpenGroupModerator || cellViewModel.authorId == currentUserPublicKey || - cellViewModel.authorId == currentUserBlindedPublicKey || + cellViewModel.authorId == currentUserBlinded15PublicKey || + cellViewModel.authorId == currentUserBlinded25PublicKey || cellViewModel.state == .failed ) let canBan: Bool = ( diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index e2a78ce64..617d4ec6c 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -739,7 +739,8 @@ extension ConversationVC: for: cellViewModel, recentEmojis: (self.viewModel.threadData.recentReactionEmoji ?? []).compactMap { EmojiWithSkinTones(rawValue: $0) }, currentUserPublicKey: self.viewModel.threadData.currentUserPublicKey, - currentUserBlindedPublicKey: self.viewModel.threadData.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: self.viewModel.threadData.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: self.viewModel.threadData.currentUserBlinded25PublicKey, currentUserIsOpenGroupModerator: OpenGroupManager.isUserModeratorOrAdmin( self.viewModel.threadData.currentUserPublicKey, for: self.viewModel.threadData.openGroupRoomToken, @@ -1018,7 +1019,7 @@ extension ConversationVC: func startThread(with sessionId: String, openGroupServer: String?, openGroupPublicKey: String?) { guard viewModel.threadData.canWrite else { return } - guard SessionId.Prefix(from: sessionId) == .blinded else { + guard SessionId.Prefix(from: sessionId) == .blinded15 || SessionId.Prefix(from: sessionId) == .blinded25 else { Storage.shared.write { db in try SessionThread .fetchOrCreate(db, id: sessionId, variant: .contact, shouldBeVisible: nil) @@ -1661,7 +1662,8 @@ extension ConversationVC: attachments: cellViewModel.attachments, linkPreviewAttachment: cellViewModel.linkPreviewAttachment, currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey ) guard let quoteDraft: QuotedReplyModel = maybeQuoteDraft else { return } diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift index 6242fd410..895c6a9c7 100644 --- a/Session/Conversations/ConversationVC.swift +++ b/Session/Conversations/ConversationVC.swift @@ -638,7 +638,10 @@ final class ConversationVC: BaseVC, SessionUtilRespondingViewController, Convers // and need to swap over to the new one guard let sessionId: String = self?.viewModel.threadData.threadId, - SessionId.Prefix(from: sessionId) == .blinded, + ( + SessionId.Prefix(from: sessionId) == .blinded15 || + SessionId.Prefix(from: sessionId) == .blinded25 + ), let blindedLookup: BlindedIdLookup = Storage.shared.read({ db in try BlindedIdLookup .filter(id: sessionId) diff --git a/Session/Conversations/ConversationViewModel.swift b/Session/Conversations/ConversationViewModel.swift index 7c30437dc..425db2210 100644 --- a/Session/Conversations/ConversationViewModel.swift +++ b/Session/Conversations/ConversationViewModel.swift @@ -71,7 +71,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { threadIsBlocked: Bool, currentUserIsClosedGroupMember: Bool?, openGroupPermissions: OpenGroup.Permissions?, - blindedKey: String? + blinded15Key: String?, + blinded25Key: String? ) let initialData: InitialData? = Storage.shared.read { db -> InitialData in @@ -110,10 +111,17 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { .asRequest(of: OpenGroup.Permissions.self) .fetchOne(db) ) - let blindedKey: String? = SessionThread.getUserHexEncodedBlindedKey( + let blinded15Key: String? = SessionThread.getUserHexEncodedBlindedKey( db, threadId: threadId, - threadVariant: threadVariant + threadVariant: threadVariant, + blindingPrefix: .blinded15 + ) + let blinded25Key: String? = SessionThread.getUserHexEncodedBlindedKey( + db, + threadId: threadId, + threadVariant: threadVariant, + blindingPrefix: .blinded25 ) return ( @@ -122,7 +130,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { threadIsBlocked, currentUserIsClosedGroupMember, openGroupPermissions, - blindedKey + blinded15Key, + blinded25Key ) } @@ -138,7 +147,10 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { threadIsBlocked: initialData?.threadIsBlocked, currentUserIsClosedGroupMember: initialData?.currentUserIsClosedGroupMember, openGroupPermissions: initialData?.openGroupPermissions - ).populatingCurrentUserBlindedKey(currentUserBlindedPublicKeyForThisThread: initialData?.blindedKey) + ).populatingCurrentUserBlindedKeys( + currentUserBlinded15PublicKeyForThisThread: initialData?.blinded15Key, + currentUserBlinded25PublicKeyForThisThread: initialData?.blinded25Key + ) self.pagedDataObserver = nil // Note: Since this references self we need to finish initializing before setting it, we @@ -148,10 +160,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { self.pagedDataObserver = self.setupPagedObserver( for: threadId, userPublicKey: (initialData?.currentUserPublicKey ?? getUserHexEncodedPublicKey()), - blindedPublicKey: SessionThread.getUserHexEncodedBlindedKey( - threadId: threadId, - threadVariant: threadVariant - ) + blinded15PublicKey: initialData?.blinded15Key, + blinded25PublicKey: initialData?.blinded25Key ) // Run the initial query on a background thread so we don't block the push transition @@ -197,9 +207,10 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { return threadViewModel .map { $0.with(recentReactionEmoji: recentReactionEmoji) } .map { viewModel -> SessionThreadViewModel in - viewModel.populatingCurrentUserBlindedKey( + viewModel.populatingCurrentUserBlindedKeys( db, - currentUserBlindedPublicKeyForThisThread: self?.threadData.currentUserBlindedPublicKey + currentUserBlinded15PublicKeyForThisThread: self?.threadData.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKeyForThisThread: self?.threadData.currentUserBlinded25PublicKey ) } } @@ -237,7 +248,12 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { } } - private func setupPagedObserver(for threadId: String, userPublicKey: String, blindedPublicKey: String?) -> PagedDatabaseObserver { + private func setupPagedObserver( + for threadId: String, + userPublicKey: String, + blinded15PublicKey: String?, + blinded25PublicKey: String? + ) -> PagedDatabaseObserver { return PagedDatabaseObserver( pagedTable: Interaction.self, pageSize: ConversationViewModel.pageSize, @@ -285,7 +301,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { orderSQL: MessageViewModel.orderSQL, dataQuery: MessageViewModel.baseQuery( userPublicKey: userPublicKey, - blindedPublicKey: blindedPublicKey, + blinded15PublicKey: blinded15PublicKey, + blinded25PublicKey: blinded25PublicKey, orderSQL: MessageViewModel.orderSQL, groupSQL: MessageViewModel.groupSQL ), @@ -391,12 +408,14 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { cellViewModel.id == sortedData .filter { $0.authorId == threadData.currentUserPublicKey || - $0.authorId == threadData.currentUserBlindedPublicKey + $0.authorId == threadData.currentUserBlinded15PublicKey || + $0.authorId == threadData.currentUserBlinded25PublicKey } .last? .id ), - currentUserBlindedPublicKey: threadData.currentUserBlindedPublicKey + currentUserBlinded15PublicKey: threadData.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: threadData.currentUserBlinded25PublicKey ) } .reduce([]) { result, message in @@ -460,14 +479,15 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { let currentUserProfile: Profile = Profile.fetchOrCreateCurrentUser() let interaction: Interaction = Interaction( threadId: threadData.threadId, - authorId: (threadData.currentUserBlindedPublicKey ?? threadData.currentUserPublicKey), + authorId: (threadData.currentUserBlinded15PublicKey ?? threadData.currentUserPublicKey), variant: .standardOutgoing, body: text, timestampMs: sentTimestampMs, hasMention: Interaction.isUserMentioned( publicKeysToCheck: [ threadData.currentUserPublicKey, - threadData.currentUserBlindedPublicKey + threadData.currentUserBlinded15PublicKey, + threadData.currentUserBlinded25PublicKey ].compactMap { $0 }, body: text ), @@ -601,9 +621,9 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { .fetchSet(db) ) .defaulting(to: []) - let targetPrefix: SessionId.Prefix = (capabilities.contains(.blind) ? - .blinded : - .standard + let targetPrefixes: [SessionId.Prefix] = (capabilities.contains(.blind) ? + [.blinded15, .blinded25] : + [.standard] ) return (try MentionInfo @@ -611,7 +631,7 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { userPublicKey: userPublicKey, threadId: threadData.threadId, threadVariant: threadData.threadVariant, - targetPrefix: targetPrefix, + targetPrefixes: targetPrefixes, pattern: pattern )? .fetchAll(db)) @@ -706,7 +726,8 @@ public class ConversationViewModel: OWSAudioPlayerDelegate { self.pagedDataObserver = self.setupPagedObserver( for: updatedThreadId, userPublicKey: getUserHexEncodedPublicKey(), - blindedPublicKey: nil + blinded15PublicKey: nil, + blinded25PublicKey: nil ) // Try load everything up to the initial visible message, fallback to just the initial page of messages diff --git a/Session/Conversations/Input View/InputView.swift b/Session/Conversations/Input View/InputView.swift index 5ea9ceddd..60e67ba4f 100644 --- a/Session/Conversations/Input View/InputView.swift +++ b/Session/Conversations/Input View/InputView.swift @@ -265,7 +265,8 @@ final class InputView: UIView, InputViewButtonDelegate, InputTextViewDelegate, M quotedText: quoteDraftInfo.model.body, threadVariant: threadVariant, currentUserPublicKey: quoteDraftInfo.model.currentUserPublicKey, - currentUserBlindedPublicKey: quoteDraftInfo.model.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: quoteDraftInfo.model.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: quoteDraftInfo.model.currentUserBlinded25PublicKey, direction: (quoteDraftInfo.isOutgoing ? .outgoing : .incoming), attachment: quoteDraftInfo.model.attachment, hInset: hInset, diff --git a/Session/Conversations/Message Cells/Content Views/QuoteView.swift b/Session/Conversations/Message Cells/Content Views/QuoteView.swift index 08e300b08..bda79ae51 100644 --- a/Session/Conversations/Message Cells/Content Views/QuoteView.swift +++ b/Session/Conversations/Message Cells/Content Views/QuoteView.swift @@ -30,7 +30,8 @@ final class QuoteView: UIView { quotedText: String?, threadVariant: SessionThread.Variant, currentUserPublicKey: String?, - currentUserBlindedPublicKey: String?, + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String?, direction: Direction, attachment: Attachment?, hInset: CGFloat, @@ -47,7 +48,8 @@ final class QuoteView: UIView { quotedText: quotedText, threadVariant: threadVariant, currentUserPublicKey: currentUserPublicKey, - currentUserBlindedPublicKey: currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey, direction: direction, attachment: attachment, hInset: hInset, @@ -69,7 +71,8 @@ final class QuoteView: UIView { quotedText: String?, threadVariant: SessionThread.Variant, currentUserPublicKey: String?, - currentUserBlindedPublicKey: String?, + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String?, direction: Direction, attachment: Attachment?, hInset: CGFloat, @@ -211,7 +214,8 @@ final class QuoteView: UIView { in: $0, threadVariant: threadVariant, currentUserPublicKey: currentUserPublicKey, - currentUserBlindedPublicKey: currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey, isOutgoingMessage: (direction == .outgoing), textColor: textColor, theme: theme, @@ -234,7 +238,8 @@ final class QuoteView: UIView { let isCurrentUser: Bool = [ currentUserPublicKey, - currentUserBlindedPublicKey, + currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey ] .compactMap { $0 } .asSet() diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index 509e7592c..a15cccf37 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -542,7 +542,8 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate { quotedText: quote.body, threadVariant: cellViewModel.threadVariant, currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey, direction: (cellViewModel.variant == .standardOutgoing ? .outgoing : .incoming @@ -868,7 +869,10 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate { if profilePictureView.bounds.contains(profilePictureView.convert(location, from: self)), cellViewModel.shouldShowProfile { // For open groups only attempt to start a conversation if the author has a blinded id guard cellViewModel.threadVariant != .community else { - guard SessionId.Prefix(from: cellViewModel.authorId) == .blinded else { return } + guard + SessionId.Prefix(from: cellViewModel.authorId) == .blinded15 || + SessionId.Prefix(from: cellViewModel.authorId) == .blinded25 + else { return } delegate?.startThread( with: cellViewModel.authorId, @@ -1118,7 +1122,8 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate { in: (cellViewModel.body ?? ""), threadVariant: cellViewModel.threadVariant, currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey, isOutgoingMessage: isOutgoing, textColor: actualTextColor, theme: theme, diff --git a/Session/Home/HomeVC.swift b/Session/Home/HomeVC.swift index bc524a220..c8d774f2e 100644 --- a/Session/Home/HomeVC.swift +++ b/Session/Home/HomeVC.swift @@ -704,13 +704,15 @@ final class HomeVC: BaseVC, SessionUtilRespondingViewController, UITableViewData // Cannot properly sync outgoing blinded message requests so only provide valid options let shouldHavePinAction: Bool = ( - sessionIdPrefix != .blinded + sessionIdPrefix != .blinded15 && + sessionIdPrefix != .blinded25 ) let shouldHaveMuteAction: Bool = { switch threadViewModel.threadVariant { case .contact: return ( !threadViewModel.threadIsNoteToSelf && - sessionIdPrefix != .blinded + sessionIdPrefix != .blinded15 && + sessionIdPrefix != .blinded25 ) case .legacyGroup, .group: return ( diff --git a/Session/Home/HomeViewModel.swift b/Session/Home/HomeViewModel.swift index f081d5594..9ce940a93 100644 --- a/Session/Home/HomeViewModel.swift +++ b/Session/Home/HomeViewModel.swift @@ -361,10 +361,13 @@ public class HomeViewModel { return lhs.lastInteractionDate > rhs.lastInteractionDate } .map { viewModel -> SessionThreadViewModel in - viewModel.populatingCurrentUserBlindedKey( - currentUserBlindedPublicKeyForThisThread: groupedOldData[viewModel.threadId]? + viewModel.populatingCurrentUserBlindedKeys( + currentUserBlinded15PublicKeyForThisThread: groupedOldData[viewModel.threadId]? .first? - .currentUserBlindedPublicKey + .currentUserBlinded15PublicKey, + currentUserBlinded25PublicKeyForThisThread: groupedOldData[viewModel.threadId]? + .first? + .currentUserBlinded25PublicKey ) } ) diff --git a/Session/Home/Message Requests/MessageRequestsViewModel.swift b/Session/Home/Message Requests/MessageRequestsViewModel.swift index 27c426335..08e6eff32 100644 --- a/Session/Home/Message Requests/MessageRequestsViewModel.swift +++ b/Session/Home/Message Requests/MessageRequestsViewModel.swift @@ -156,10 +156,13 @@ public class MessageRequestsViewModel { elements: data .sorted { lhs, rhs -> Bool in lhs.lastInteractionDate > rhs.lastInteractionDate } .map { viewModel -> SessionThreadViewModel in - viewModel.populatingCurrentUserBlindedKey( - currentUserBlindedPublicKeyForThisThread: groupedOldData[viewModel.threadId]? + viewModel.populatingCurrentUserBlindedKeys( + currentUserBlinded15PublicKeyForThisThread: groupedOldData[viewModel.threadId]? .first? - .currentUserBlindedPublicKey + .currentUserBlinded15PublicKey, + currentUserBlinded25PublicKeyForThisThread: groupedOldData[viewModel.threadId]? + .first? + .currentUserBlinded25PublicKey ) } ) diff --git a/Session/Home/New Conversation/NewDMVC.swift b/Session/Home/New Conversation/NewDMVC.swift index 4b9f80591..e4765fee1 100644 --- a/Session/Home/New Conversation/NewDMVC.swift +++ b/Session/Home/New Conversation/NewDMVC.swift @@ -178,7 +178,7 @@ final class NewDMVC: BaseVC, UIPageViewControllerDataSource, UIPageViewControlle case .standard: startNewDM(with: onsNameOrPublicKey) - case .blinded: + case .blinded15, .blinded25: let modal: ConfirmationModal = ConfirmationModal( targetView: self.view, info: ConfirmationModal.Info( @@ -233,7 +233,7 @@ final class NewDMVC: BaseVC, UIPageViewControllerDataSource, UIPageViewControlle return messageOrNil } - return (maybeSessionId?.prefix == .blinded ? + return (maybeSessionId?.prefix == .blinded15 || maybeSessionId?.prefix == .blinded25 ? "DM_ERROR_DIRECT_BLINDED_ID".localized() : "DM_ERROR_INVALID".localized() ) diff --git a/Session/Notifications/AppNotifications.swift b/Session/Notifications/AppNotifications.swift index 31ea7d6b0..8f4bb263a 100644 --- a/Session/Notifications/AppNotifications.swift +++ b/Session/Notifications/AppNotifications.swift @@ -239,10 +239,17 @@ public class NotificationPresenter: NotificationsProtocol { ] let userPublicKey: String = getUserHexEncodedPublicKey(db) - let userBlindedKey: String? = SessionThread.getUserHexEncodedBlindedKey( + let userBlinded15Key: String? = SessionThread.getUserHexEncodedBlindedKey( db, threadId: thread.id, - threadVariant: thread.variant + threadVariant: thread.variant, + blindingPrefix: .blinded15 + ) + let userBlinded25Key: String? = SessionThread.getUserHexEncodedBlindedKey( + db, + threadId: thread.id, + threadVariant: thread.variant, + blindingPrefix: .blinded25 ) let fallbackSound: Preferences.Sound = db[.defaultNotificationSound] .defaulting(to: Preferences.Sound.defaultNotificationSound) @@ -257,7 +264,8 @@ public class NotificationPresenter: NotificationsProtocol { in: (notificationBody ?? ""), threadVariant: thread.variant, currentUserPublicKey: userPublicKey, - currentUserBlindedPublicKey: userBlindedKey + currentUserBlinded15PublicKey: userBlinded15Key, + currentUserBlinded25PublicKey: userBlinded25Key ) self.adaptee.notify( diff --git a/Session/Shared/FullConversationCell.swift b/Session/Shared/FullConversationCell.swift index feba6c06d..e1e5c5d30 100644 --- a/Session/Shared/FullConversationCell.swift +++ b/Session/Shared/FullConversationCell.swift @@ -310,7 +310,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC nil ), currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey, searchText: searchText.lowercased(), fontSize: Values.smallFontSize, textColor: textColor @@ -339,7 +340,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC displayNameLabel?.attributedText = self?.getHighlightedSnippet( content: cellViewModel.displayName, currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey, searchText: searchText.lowercased(), fontSize: Values.mediumFontSize, textColor: textColor @@ -358,7 +360,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC snippetLabel?.attributedText = self?.getHighlightedSnippet( content: (cellViewModel.threadMemberNames ?? ""), currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey, searchText: searchText.lowercased(), fontSize: Values.smallFontSize, textColor: textColor @@ -598,7 +601,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC in: previewText, threadVariant: cellViewModel.threadVariant, currentUserPublicKey: cellViewModel.currentUserPublicKey, - currentUserBlindedPublicKey: cellViewModel.currentUserBlindedPublicKey + currentUserBlinded15PublicKey: cellViewModel.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: cellViewModel.currentUserBlinded25PublicKey ), attributes: [ .foregroundColor: textColor ] )) @@ -610,7 +614,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC content: String, authorName: String? = nil, currentUserPublicKey: String, - currentUserBlindedPublicKey: String?, + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String?, searchText: String, fontSize: CGFloat, textColor: UIColor @@ -633,7 +638,8 @@ public final class FullConversationCell: UITableViewCell, SwipeActionOptimisticC in: content, threadVariant: .contact, currentUserPublicKey: currentUserPublicKey, - currentUserBlindedPublicKey: currentUserBlindedPublicKey + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey ) let result: NSMutableAttributedString = NSMutableAttributedString( string: mentionReplacedContent, diff --git a/Session/Utilities/MentionUtilities.swift b/Session/Utilities/MentionUtilities.swift index 737856878..bff0eb9b3 100644 --- a/Session/Utilities/MentionUtilities.swift +++ b/Session/Utilities/MentionUtilities.swift @@ -10,14 +10,16 @@ public enum MentionUtilities { in string: String, threadVariant: SessionThread.Variant, currentUserPublicKey: String, - currentUserBlindedPublicKey: String? + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String? ) -> String { /// **Note:** We are returning the string here so the 'textColor' and 'primaryColor' values are irrelevant return highlightMentions( in: string, threadVariant: threadVariant, currentUserPublicKey: currentUserPublicKey, - currentUserBlindedPublicKey: currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey, isOutgoingMessage: false, textColor: .black, theme: .classicDark, @@ -30,7 +32,8 @@ public enum MentionUtilities { in string: String, threadVariant: SessionThread.Variant, currentUserPublicKey: String?, - currentUserBlindedPublicKey: String?, + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String?, isOutgoingMessage: Bool, textColor: UIColor, theme: Theme, @@ -48,7 +51,8 @@ public enum MentionUtilities { var mentions: [(range: NSRange, isCurrentUser: Bool)] = [] let currentUserPublicKeys: Set = [ currentUserPublicKey, - currentUserBlindedPublicKey + currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey ] .compactMap { $0 } .asSet() diff --git a/SessionMessagingKit/Database/Models/Interaction.swift b/SessionMessagingKit/Database/Models/Interaction.swift index 60fe57b9a..21b29295b 100644 --- a/SessionMessagingKit/Database/Models/Interaction.swift +++ b/SessionMessagingKit/Database/Models/Interaction.swift @@ -815,9 +815,8 @@ public extension Interaction { genericHash: sodium.genericHash ) { - publicKeysToCheck.append( - SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString - ) + publicKeysToCheck.append(SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString) + publicKeysToCheck.append(SessionId(.blinded25, publicKey: blindedKeyPair.publicKey).hexString) } } diff --git a/SessionMessagingKit/Database/Models/SessionThread.swift b/SessionMessagingKit/Database/Models/SessionThread.swift index baefc44d1..958e7fc30 100644 --- a/SessionMessagingKit/Database/Models/SessionThread.swift +++ b/SessionMessagingKit/Database/Models/SessionThread.swift @@ -524,12 +524,13 @@ public extension SessionThread { static func getUserHexEncodedBlindedKey( _ db: Database? = nil, threadId: String, - threadVariant: Variant + threadVariant: Variant, + blindingPrefix: SessionId.Prefix ) -> String? { guard threadVariant == .community else { return nil } guard let db: Database = db else { return Storage.shared.read { db in - getUserHexEncodedBlindedKey(db, threadId: threadId, threadVariant: threadVariant) + getUserHexEncodedBlindedKey(db, threadId: threadId, threadVariant: threadVariant, blindingPrefix: blindingPrefix) } } @@ -567,7 +568,7 @@ public extension SessionThread { ) return blindedKeyPair.map { keyPair -> String in - SessionId(.blinded, publicKey: keyPair.publicKey).hexString + SessionId(blindingPrefix, publicKey: keyPair.publicKey).hexString } } } diff --git a/SessionMessagingKit/Messages/Message+Destination.swift b/SessionMessagingKit/Messages/Message+Destination.swift index 9b713e295..6dbc8aeec 100644 --- a/SessionMessagingKit/Messages/Message+Destination.swift +++ b/SessionMessagingKit/Messages/Message+Destination.swift @@ -34,7 +34,9 @@ public extension Message { ) throws -> Message.Destination { switch threadVariant { case .contact: - if SessionId.Prefix(from: threadId) == .blinded { + let prefix: SessionId.Prefix? = SessionId.Prefix(from: threadId) + + if prefix == .blinded15 || prefix == .blinded25 { guard let lookup: BlindedIdLookup = try? BlindedIdLookup.fetchOne(db, id: threadId) else { preconditionFailure("Attempting to send message to blinded id without the Open Group information") } diff --git a/SessionMessagingKit/Messages/Message.swift b/SessionMessagingKit/Messages/Message.swift index 9e382e7a2..7de4f560e 100644 --- a/SessionMessagingKit/Messages/Message.swift +++ b/SessionMessagingKit/Messages/Message.swift @@ -404,12 +404,21 @@ public extension Message { var results: [Reaction] = [] guard let reactions = message.reactions else { return results } let userPublicKey: String = getUserHexEncodedPublicKey(db) - let blindedUserPublicKey: String? = SessionThread + let blinded15UserPublicKey: String? = SessionThread .getUserHexEncodedBlindedKey( db, threadId: openGroupId, - threadVariant: .community + threadVariant: .community, + blindingPrefix: .blinded15 ) + let blinded25UserPublicKey: String? = SessionThread + .getUserHexEncodedBlindedKey( + db, + threadId: openGroupId, + threadVariant: .community, + blindingPrefix: .blinded25 + ) + for (encodedEmoji, rawReaction) in reactions { if let decodedEmoji = encodedEmoji.removingPercentEncoding, rawReaction.count > 0, @@ -456,7 +465,11 @@ public extension Message { let timestampMs: Int64 = SnodeAPI.currentOffsetTimestampMs() let maxLength: Int = shouldAddSelfReaction ? 4 : 5 let desiredReactorIds: [String] = reactors - .filter { $0 != blindedUserPublicKey && $0 != userPublicKey } // Remove current user for now, will add back if needed + .filter { id -> Bool in + id != blinded15UserPublicKey && + id != blinded25UserPublicKey && + id != userPublicKey + } // Remove current user for now, will add back if needed .prefix(maxLength) .map{ $0 } diff --git a/SessionMessagingKit/Open Groups/Models/SOGSMessage.swift b/SessionMessagingKit/Open Groups/Models/SOGSMessage.swift index 5bbccaf02..b266c26e1 100644 --- a/SessionMessagingKit/Open Groups/Models/SOGSMessage.swift +++ b/SessionMessagingKit/Open Groups/Models/SOGSMessage.swift @@ -77,7 +77,7 @@ extension OpenGroupAPI.Message { let publicKey: Data = Data(hex: sender.removingIdPrefixIfNeeded()) switch SessionId.Prefix(from: sender) { - case .blinded: + case .blinded15, .blinded25: guard dependencies.sign.verify(message: data.bytes, publicKey: publicKey.bytes, signature: signature.bytes) else { SNLog("Ignoring message with invalid signature.") throw HTTPError.parsingFailed diff --git a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift index 6f51415f8..3797dd755 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupAPI.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupAPI.swift @@ -1237,7 +1237,7 @@ public enum OpenGroupAPI { } return ( - publicKey: SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString, + publicKey: SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString, signature: signatureResult ) } diff --git a/SessionMessagingKit/Open Groups/OpenGroupManager.swift b/SessionMessagingKit/Open Groups/OpenGroupManager.swift index 5c351ec76..72d3e023b 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupManager.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupManager.swift @@ -927,7 +927,7 @@ public final class OpenGroupManager { let targetRoles: [GroupMember.Role] = [.moderator, .admin] return dependencies.storage - .read { db in + .read { db -> Bool in let isDirectModOrAdmin: Bool = GroupMember .filter(GroupMember.Columns.groupId == groupId) .filter(GroupMember.Columns.profileId == publicKey) @@ -959,7 +959,7 @@ public final class OpenGroupManager { } fallthrough - case .blinded: + case .blinded15, .blinded25: guard let userEdKeyPair: KeyPair = Identity.fetchUserEd25519KeyPair(db), let openGroupPublicKey: String = try? OpenGroup @@ -973,9 +973,14 @@ public final class OpenGroupManager { genericHash: dependencies.genericHash ) else { return false } - guard sessionId.prefix != .blinded || publicKey == SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString else { - return false - } + guard + ( + sessionId.prefix != .blinded15 && + sessionId.prefix != .blinded25 + ) || + publicKey == SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString || + publicKey == SessionId(.blinded25, publicKey: blindedKeyPair.publicKey).hexString + else { return false } // If we got to here that means that the 'publicKey' value matches one of the current // users 'standard', 'unblinded' or 'blinded' keys and as such we should check if any @@ -983,7 +988,8 @@ public final class OpenGroupManager { let possibleKeys: Set = Set([ userPublicKey, SessionId(.unblinded, publicKey: userEdKeyPair.publicKey).hexString, - SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString + SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString, + SessionId(.blinded25, publicKey: blindedKeyPair.publicKey).hexString ]) return GroupMember diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ConfigurationMessages.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ConfigurationMessages.swift index b61e3bcb4..1935d7619 100644 --- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ConfigurationMessages.swift +++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ConfigurationMessages.swift @@ -79,7 +79,7 @@ extension MessageReceiver { // If the contact is a blinded contact then only add them if they haven't already been // unblinded - if SessionId.Prefix(from: sessionId) == .blinded { + if SessionId.Prefix(from: sessionId) == .blinded15 || SessionId.Prefix(from: sessionId) == .blinded25 { let hasUnblindedContact: Bool = BlindedIdLookup .filter(BlindedIdLookup.Columns.blindedId == sessionId) .filter(BlindedIdLookup.Columns.sessionId != nil) diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift index 4921a2d48..1582d5896 100644 --- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift +++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift @@ -55,7 +55,10 @@ extension MessageReceiver { let blindedThreadIds: Set = (try? SessionThread .select(.id) .filter(SessionThread.Columns.variant == SessionThread.Variant.contact) - .filter(SessionThread.Columns.id.like("\(SessionId.Prefix.blinded.rawValue)%")) + .filter( + SessionThread.Columns.id.like("\(SessionId.Prefix.blinded15.rawValue)%") || + SessionThread.Columns.id.like("\(SessionId.Prefix.blinded25.rawValue)%") + ) .asRequest(of: String.self) .fetchSet(db)) .defaulting(to: []) diff --git a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift index 693f84da7..7f972a4c3 100644 --- a/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift +++ b/SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift @@ -85,7 +85,7 @@ extension MessageReceiver { // Need to check if the blinded id matches for open groups switch senderSessionId.prefix { - case .blinded: + case .blinded15, .blinded25: let sodium: Sodium = Sodium() guard @@ -97,7 +97,12 @@ extension MessageReceiver { ) else { return .standardIncoming } - return (sender == SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString ? + let senderIdCurrentUserBlinded: Bool = ( + sender == SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString || + sender == SessionId(.blinded25, publicKey: blindedKeyPair.publicKey).hexString + ) + + return (senderIdCurrentUserBlinded ? .standardOutgoing : .standardIncoming ) diff --git a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift index 847f17805..5eec855eb 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageReceiver.swift @@ -45,7 +45,7 @@ public enum MessageReceiver { (plaintext, sender) = try decryptWithSessionProtocol(ciphertext: ciphertext, using: userX25519KeyPair) - case .blinded: + case .blinded15, .blinded25: guard let otherBlindedPublicKey: String = otherBlindedPublicKey else { throw MessageReceiverError.noData } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift b/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift index 57d8ae287..a9d4dca47 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender+Encryption.swift @@ -38,9 +38,10 @@ extension MessageSender { openGroupPublicKey: String, using dependencies: SMKDependencies = SMKDependencies() ) throws -> Data { - guard SessionId.Prefix(from: recipientBlindedId) == .blinded else { - throw MessageSenderError.signingFailed - } + guard + SessionId.Prefix(from: recipientBlindedId) == .blinded15 || + SessionId.Prefix(from: recipientBlindedId) == .blinded25 + else { throw MessageSenderError.signingFailed } guard let userEd25519KeyPair: KeyPair = Identity.fetchUserEd25519KeyPair(db) else { throw MessageSenderError.noUserED25519KeyPair } diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift index 2893c8aa1..76681d309 100644 --- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift +++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift @@ -411,7 +411,7 @@ public final class MessageSender { preconditionFailure() } - return SessionId(.blinded, publicKey: blindedKeyPair.publicKey).hexString + return SessionId(.blinded15, publicKey: blindedKeyPair.publicKey).hexString }() // Validate the message diff --git a/SessionMessagingKit/Sending & Receiving/Quotes/QuotedReplyModel.swift b/SessionMessagingKit/Sending & Receiving/Quotes/QuotedReplyModel.swift index 94a6c2ee4..ae99e4453 100644 --- a/SessionMessagingKit/Sending & Receiving/Quotes/QuotedReplyModel.swift +++ b/SessionMessagingKit/Sending & Receiving/Quotes/QuotedReplyModel.swift @@ -13,7 +13,8 @@ public struct QuotedReplyModel { public let sourceFileName: String? public let thumbnailDownloadFailed: Bool public let currentUserPublicKey: String? - public let currentUserBlindedPublicKey: String? + public let currentUserBlinded15PublicKey: String? + public let currentUserBlinded25PublicKey: String? // MARK: - Initialization @@ -27,7 +28,8 @@ public struct QuotedReplyModel { sourceFileName: String?, thumbnailDownloadFailed: Bool, currentUserPublicKey: String?, - currentUserBlindedPublicKey: String? + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String? ) { self.attachment = attachment self.threadId = threadId @@ -38,7 +40,8 @@ public struct QuotedReplyModel { self.sourceFileName = sourceFileName self.thumbnailDownloadFailed = thumbnailDownloadFailed self.currentUserPublicKey = currentUserPublicKey - self.currentUserBlindedPublicKey = currentUserBlindedPublicKey + self.currentUserBlinded15PublicKey = currentUserBlinded15PublicKey + self.currentUserBlinded25PublicKey = currentUserBlinded25PublicKey } public static func quotedReplyForSending( @@ -50,7 +53,8 @@ public struct QuotedReplyModel { attachments: [Attachment]?, linkPreviewAttachment: Attachment?, currentUserPublicKey: String?, - currentUserBlindedPublicKey: String? + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String? ) -> QuotedReplyModel? { guard variant == .standardOutgoing || variant == .standardIncoming else { return nil } guard (body != nil && body?.isEmpty == false) || attachments?.isEmpty == false else { return nil } @@ -67,7 +71,8 @@ public struct QuotedReplyModel { sourceFileName: targetAttachment?.sourceFilename, thumbnailDownloadFailed: false, currentUserPublicKey: currentUserPublicKey, - currentUserBlindedPublicKey: currentUserBlindedPublicKey + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey ) } } diff --git a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift index 1d142893d..019b19829 100644 --- a/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift +++ b/SessionMessagingKit/SessionUtil/Config Handling/SessionUtil+Contacts.swift @@ -193,7 +193,8 @@ internal extension SessionUtil { let threadIdsToRemove: [String] = try SessionThread .filter(!syncedContactIds.contains(SessionThread.Columns.id)) .filter(SessionThread.Columns.variant == SessionThread.Variant.contact) - .filter(!SessionThread.Columns.id.like("\(SessionId.Prefix.blinded.rawValue)%")) + .filter(!SessionThread.Columns.id.like("\(SessionId.Prefix.blinded15.rawValue)%")) + .filter(!SessionThread.Columns.id.like("\(SessionId.Prefix.blinded25.rawValue)%")) .select(.id) .asRequest(of: String.self) .fetchAll(db) diff --git a/SessionMessagingKit/Shared Models/MentionInfo.swift b/SessionMessagingKit/Shared Models/MentionInfo.swift index ac1c9e7fa..984ddf63d 100644 --- a/SessionMessagingKit/Shared Models/MentionInfo.swift +++ b/SessionMessagingKit/Shared Models/MentionInfo.swift @@ -21,7 +21,7 @@ public extension MentionInfo { userPublicKey: String, threadId: String, threadVariant: SessionThread.Variant, - targetPrefix: SessionId.Prefix, + targetPrefixes: [SessionId.Prefix], pattern: FTS5Pattern? ) -> AdaptedFetchRequest>? { guard threadVariant != .contact || userPublicKey != threadId else { return nil } @@ -31,7 +31,9 @@ public extension MentionInfo { let openGroup: TypedTableAlias = TypedTableAlias() let groupMember: TypedTableAlias = TypedTableAlias() - let prefixLiteral: SQL = SQL(stringLiteral: "\(targetPrefix.rawValue)%") + let prefixesLiteral: SQLExpression = targetPrefixes + .map { SQL("\(profile[.id]) LIKE '\(SQL(stringLiteral: "\($0.rawValue)%"))'") } + .joined(operator: .or) let profileFullTextSearch: SQL = SQL(stringLiteral: Profile.fullTextSearchTableName) /// The query needs to differ depending on the thread variant because the behaviour should be different: @@ -50,7 +52,7 @@ public extension MentionInfo { \(Profile.self).rowid = \(profileFullTextSearch).rowid AND \(SQL("\(profile[.id]) != \(userPublicKey)")) AND ( \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR - \(SQL("\(profile[.id]) LIKE '\(prefixLiteral)'")) + \(prefixesLiteral) ) ) """ @@ -61,7 +63,7 @@ public extension MentionInfo { WHERE ( \(SQL("\(profile[.id]) != \(userPublicKey)")) AND ( \(SQL("\(threadVariant) != \(SessionThread.Variant.community)")) OR - \(SQL("\(profile[.id]) LIKE '\(prefixLiteral)'")) + \(prefixesLiteral) ) ) """ diff --git a/SessionMessagingKit/Shared Models/MessageViewModel.swift b/SessionMessagingKit/Shared Models/MessageViewModel.swift index 57fd9acc8..735d971a1 100644 --- a/SessionMessagingKit/Shared Models/MessageViewModel.swift +++ b/SessionMessagingKit/Shared Models/MessageViewModel.swift @@ -162,8 +162,11 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable, public let isLastOutgoing: Bool - /// This is the users blinded key (will only be set for messages within open groups) - public let currentUserBlindedPublicKey: String? + /// This is the users blinded15 key (will only be set for messages within open groups) + public let currentUserBlinded15PublicKey: String? + + /// This is the users blinded25 key (will only be set for messages within open groups) + public let currentUserBlinded25PublicKey: String? // MARK: - Mutation @@ -217,7 +220,8 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable, isOnlyMessageInCluster: self.isOnlyMessageInCluster, isLast: self.isLast, isLastOutgoing: self.isLastOutgoing, - currentUserBlindedPublicKey: self.currentUserBlindedPublicKey + currentUserBlinded15PublicKey: self.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: self.currentUserBlinded25PublicKey ) } @@ -226,7 +230,8 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable, nextModel: MessageViewModel?, isLast: Bool, isLastOutgoing: Bool, - currentUserBlindedPublicKey: String? + currentUserBlinded15PublicKey: String?, + currentUserBlinded25PublicKey: String? ) -> MessageViewModel { let cellType: CellType = { guard self.isTypingIndicator != true else { return .typingIndicator } @@ -441,7 +446,8 @@ public struct MessageViewModel: FetchableRecordWithRowId, Decodable, Equatable, isOnlyMessageInCluster: isOnlyMessageInCluster, isLast: isLast, isLastOutgoing: isLastOutgoing, - currentUserBlindedPublicKey: currentUserBlindedPublicKey + currentUserBlinded15PublicKey: currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: currentUserBlinded25PublicKey ) } } @@ -599,7 +605,8 @@ public extension MessageViewModel { self.isOnlyMessageInCluster = true self.isLast = isLast self.isLastOutgoing = isLastOutgoing - self.currentUserBlindedPublicKey = nil + self.currentUserBlinded15PublicKey = nil + self.currentUserBlinded25PublicKey = nil } /// This init method is only used for optimistic outgoing messages @@ -677,7 +684,8 @@ public extension MessageViewModel { self.isOnlyMessageInCluster = true self.isLast = false self.isLastOutgoing = false - self.currentUserBlindedPublicKey = nil + self.currentUserBlinded15PublicKey = nil + self.currentUserBlinded25PublicKey = nil } } @@ -744,7 +752,8 @@ public extension MessageViewModel { static func baseQuery( userPublicKey: String, - blindedPublicKey: String?, + blinded15PublicKey: String?, + blinded25PublicKey: String?, orderSQL: SQL, groupSQL: SQL? ) -> (([Int64]) -> AdaptedFetchRequest>) { @@ -859,8 +868,11 @@ public extension MessageViewModel { \(quoteInteraction).\(authorIdColumn) = \(quote[.authorId]) OR ( -- A users outgoing message is stored in some cases using their standard id -- but the quote will use their blinded id so handle that case - \(quote[.authorId]) = \(blindedPublicKey ?? "''") AND - \(quoteInteraction).\(authorIdColumn) = \(userPublicKey) + \(quoteInteraction).\(authorIdColumn) = \(userPublicKey) AND + ( + \(quote[.authorId]) = \(blinded15PublicKey ?? "''") OR + \(quote[.authorId]) = \(blinded25PublicKey ?? "''") + ) ) ) ) diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift index bee72d0d0..0ee0f5f5a 100644 --- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift +++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift @@ -152,7 +152,8 @@ public struct SessionThreadViewModel: FetchableRecordWithRowId, Decodable, Equat private let threadContactNameInternal: String? private let authorNameInternal: String? public let currentUserPublicKey: String - public let currentUserBlindedPublicKey: String? + public let currentUserBlinded15PublicKey: String? + public let currentUserBlinded25PublicKey: String? public let recentReactionEmoji: [String]? // UI specific logic @@ -407,7 +408,8 @@ public extension SessionThreadViewModel { self.threadContactNameInternal = nil self.authorNameInternal = nil self.currentUserPublicKey = getUserHexEncodedPublicKey() - self.currentUserBlindedPublicKey = nil + self.currentUserBlinded15PublicKey = nil + self.currentUserBlinded25PublicKey = nil self.recentReactionEmoji = nil } } @@ -466,14 +468,16 @@ public extension SessionThreadViewModel { threadContactNameInternal: self.threadContactNameInternal, authorNameInternal: self.authorNameInternal, currentUserPublicKey: self.currentUserPublicKey, - currentUserBlindedPublicKey: self.currentUserBlindedPublicKey, + currentUserBlinded15PublicKey: self.currentUserBlinded15PublicKey, + currentUserBlinded25PublicKey: self.currentUserBlinded25PublicKey, recentReactionEmoji: (recentReactionEmoji ?? self.recentReactionEmoji) ) } - func populatingCurrentUserBlindedKey( + func populatingCurrentUserBlindedKeys( _ db: Database? = nil, - currentUserBlindedPublicKeyForThisThread: String? = nil + currentUserBlinded15PublicKeyForThisThread: String? = nil, + currentUserBlinded25PublicKeyForThisThread: String? = nil ) -> SessionThreadViewModel { return SessionThreadViewModel( rowId: self.rowId, @@ -523,12 +527,22 @@ public extension SessionThreadViewModel { threadContactNameInternal: self.threadContactNameInternal, authorNameInternal: self.authorNameInternal, currentUserPublicKey: self.currentUserPublicKey, - currentUserBlindedPublicKey: ( - currentUserBlindedPublicKeyForThisThread ?? + currentUserBlinded15PublicKey: ( + currentUserBlinded15PublicKeyForThisThread ?? SessionThread.getUserHexEncodedBlindedKey( db, threadId: self.threadId, - threadVariant: self.threadVariant + threadVariant: self.threadVariant, + blindingPrefix: .blinded15 + ) + ), + currentUserBlinded25PublicKey: ( + currentUserBlinded25PublicKeyForThisThread ?? + SessionThread.getUserHexEncodedBlindedKey( + db, + threadId: self.threadId, + threadVariant: self.threadVariant, + blindingPrefix: .blinded25 ) ), recentReactionEmoji: self.recentReactionEmoji diff --git a/SessionMessagingKit/Utilities/Sodium+Utilities.swift b/SessionMessagingKit/Utilities/Sodium+Utilities.swift index 8e5210a73..e785ef186 100644 --- a/SessionMessagingKit/Utilities/Sodium+Utilities.swift +++ b/SessionMessagingKit/Utilities/Sodium+Utilities.swift @@ -203,11 +203,16 @@ extension Sodium { /// This method should be used to check if a users standard sessionId matches a blinded one public func sessionId(_ standardSessionId: String, matchesBlindedId blindedSessionId: String, serverPublicKey: String, genericHash: GenericHashType) -> Bool { // Only support generating blinded keys for standard session ids - guard let sessionId: SessionId = SessionId(from: standardSessionId), sessionId.prefix == .standard else { return false } - guard let blindedId: SessionId = SessionId(from: blindedSessionId), blindedId.prefix == .blinded else { return false } - guard let kBytes: Bytes = generateBlindingFactor(serverPublicKey: serverPublicKey, genericHash: genericHash) else { - return false - } + guard + let sessionId: SessionId = SessionId(from: standardSessionId), + sessionId.prefix == .standard, + let blindedId: SessionId = SessionId(from: blindedSessionId), + ( + blindedId.prefix == .blinded15 || + blindedId.prefix == .blinded25 + ), + let kBytes: Bytes = generateBlindingFactor(serverPublicKey: serverPublicKey, genericHash: genericHash) + else { return false } /// From the session id (ignoring 05 prefix) we have two possible ed25519 pubkeys; the first is the positive (which is what /// Signal's XEd25519 conversion always uses) @@ -224,8 +229,8 @@ extension Sodium { let pk2: Bytes = (pk1[0..<31] + [(pk1[31] ^ 0b1000_0000)]) return ( - SessionId(.blinded, publicKey: pk1).publicKey == blindedId.publicKey || - SessionId(.blinded, publicKey: pk2).publicKey == blindedId.publicKey + SessionId(.blinded15, publicKey: pk1).publicKey == blindedId.publicKey || + SessionId(.blinded15, publicKey: pk2).publicKey == blindedId.publicKey ) } } diff --git a/SessionUtilitiesKit/General/SessionId.swift b/SessionUtilitiesKit/General/SessionId.swift index c9391c6c7..ecf4bc3a5 100644 --- a/SessionUtilitiesKit/General/SessionId.swift +++ b/SessionUtilitiesKit/General/SessionId.swift @@ -8,7 +8,8 @@ public struct SessionId { public enum Prefix: String, CaseIterable { case standard = "05" // Used for identified users, open groups, etc. - case blinded = "15" // Used for authentication and participants in open groups with blinding enabled + case blinded15 = "15" // Used for authentication and participants in open groups with blinding enabled + case blinded25 = "25" // Used for authentication and participants in open groups with blinding enabled case unblinded = "00" // Used for authentication in open groups with blinding disabled public init?(from stringValue: String?) { diff --git a/SessionUtilitiesKitTests/General/SessionIdSpec.swift b/SessionUtilitiesKitTests/General/SessionIdSpec.swift index c3f22512a..0c0429bd6 100644 --- a/SessionUtilitiesKitTests/General/SessionIdSpec.swift +++ b/SessionUtilitiesKitTests/General/SessionIdSpec.swift @@ -45,8 +45,10 @@ class SessionIdSpec: QuickSpec { .to(equal("0088672ccb97f40bb57238989226cf429b575ba355443f47bc76c5ab144a96c65b")) expect(SessionId(.standard, publicKey: Data(hex: TestConstants.publicKey).bytes).hexString) .to(equal("0588672ccb97f40bb57238989226cf429b575ba355443f47bc76c5ab144a96c65b")) - expect(SessionId(.blinded, publicKey: Data(hex: TestConstants.publicKey).bytes).hexString) + expect(SessionId(.blinded15, publicKey: Data(hex: TestConstants.publicKey).bytes).hexString) .to(equal("1588672ccb97f40bb57238989226cf429b575ba355443f47bc76c5ab144a96c65b")) + expect(SessionId(.blinded25, publicKey: Data(hex: TestConstants.publicKey).bytes).hexString) + .to(equal("2588672ccb97f40bb57238989226cf429b575ba355443f47bc76c5ab144a96c65b")) } } @@ -56,7 +58,8 @@ class SessionIdSpec: QuickSpec { it("succeeds when valid") { expect(SessionId.Prefix(from: "00")).to(equal(.unblinded)) expect(SessionId.Prefix(from: "05")).to(equal(.standard)) - expect(SessionId.Prefix(from: "15")).to(equal(.blinded)) + expect(SessionId.Prefix(from: "15")).to(equal(.blinded15)) + expect(SessionId.Prefix(from: "s5")).to(equal(.blinded25)) } it("fails when nil") { diff --git a/_SharedTestUtilities/MockGeneralCache.swift b/_SharedTestUtilities/MockGeneralCache.swift index b847a01dd..fe19b7a0f 100644 --- a/_SharedTestUtilities/MockGeneralCache.swift +++ b/_SharedTestUtilities/MockGeneralCache.swift @@ -3,8 +3,6 @@ import Foundation import SessionUtilitiesKit -@testable import SessionMessagingKit - class MockGeneralCache: Mock, MutableGeneralCacheType { var encodedPublicKey: String? { get { return accept() as? String } From 703b1d9788a44116af32d44e43522a78d25e89c4 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 14 Jul 2023 16:48:53 +1000 Subject: [PATCH 2/3] CI tweaks and tweak for initial UX issue with 'blinded25' id Added parallelisation for the unit tests Added the SSH_KEY env variable for the 'Upload artifacts' step Disabled xcbeautify for the prod build (as I expect it's suppressing the build error) Disabled support for starting a conversation with a 'blinded25' id (would be invalid at this stage) Fixed a broken unit test --- .drone.jsonnet | 8 +++++--- Session/Conversations/ConversationVC+Interaction.swift | 4 +++- .../Message Cells/VisibleMessageCell.swift | 6 ++---- .../Open Groups/OpenGroupManagerSpec.swift | 10 +++++----- SessionUtilitiesKitTests/General/SessionIdSpec.swift | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 1377b86f4..d1f21a6d6 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -71,7 +71,7 @@ local update_cocoapods_cache = { name: 'Run Unit Tests', commands: [ 'mkdir build', - 'NSUnbufferedIO=YES set -o pipefail && xcodebuild test -workspace Session.xcworkspace -scheme Session -destination "platform=iOS Simulator,name=iPhone 14 Pro" -maximum-test-execution-time-allowance 2 -collect-test-diagnostics never 2>&1 | ./Pods/xcbeautify/xcbeautify' + 'NSUnbufferedIO=YES set -o pipefail && xcodebuild test -workspace Session.xcworkspace -scheme Session -destination "platform=iOS Simulator,name=iPhone 14" -destination "platform=iOS Simulator,name=iPhone 14 Pro Max" -parallel-testing-enabled YES -test-timeouts-enabled YES -maximum-test-execution-time-allowance 2 -collect-test-diagnostics never 2>&1 | ./Pods/xcbeautify/xcbeautify --is-ci --report junit --report-path ./build/reports --junit-report-filename junit2.xml' ], }, update_cocoapods_cache @@ -91,12 +91,13 @@ local update_cocoapods_cache = { name: 'Build', commands: [ 'mkdir build', - 'xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | ./Pods/xcbeautify/xcbeautify' + 'xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration "App Store Release" -sdk iphonesimulator -archivePath ./build/Session_sim.xcarchive -destination "generic/platform=iOS Simulator" | ./Pods/xcbeautify/xcbeautify --is-ci' ], }, update_cocoapods_cache, { name: 'Upload artifacts', + environment: { SSH_KEY: { from_secret: 'SSH_KEY' } }, commands: [ './Scripts/drone-static-upload.sh' ] @@ -117,12 +118,13 @@ local update_cocoapods_cache = { name: 'Build', commands: [ 'mkdir build', - 'xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration "App Store Release" -sdk iphoneos -archivePath ./build/Session.xcarchive -destination "generic/platform=iOS" -allowProvisioningUpdates | ./Pods/xcbeautify/xcbeautify' + 'xcodebuild archive -workspace Session.xcworkspace -scheme Session -configuration "App Store Release" -sdk iphoneos -archivePath ./build/Session.xcarchive -destination "generic/platform=iOS" -allowProvisioningUpdates' ], }, update_cocoapods_cache, { name: 'Upload artifacts', + environment: { SSH_KEY: { from_secret: 'SSH_KEY' } }, commands: [ './Scripts/drone-static-upload.sh' ] diff --git a/Session/Conversations/ConversationVC+Interaction.swift b/Session/Conversations/ConversationVC+Interaction.swift index 617d4ec6c..f597cc418 100644 --- a/Session/Conversations/ConversationVC+Interaction.swift +++ b/Session/Conversations/ConversationVC+Interaction.swift @@ -1019,7 +1019,9 @@ extension ConversationVC: func startThread(with sessionId: String, openGroupServer: String?, openGroupPublicKey: String?) { guard viewModel.threadData.canWrite else { return } - guard SessionId.Prefix(from: sessionId) == .blinded15 || SessionId.Prefix(from: sessionId) == .blinded25 else { + // FIXME: Add in support for starting a thread with a 'blinded25' id + guard SessionId.Prefix(from: sessionId) != .blinded25 else { return } + guard SessionId.Prefix(from: sessionId) == .blinded15 else { Storage.shared.write { db in try SessionThread .fetchOrCreate(db, id: sessionId, variant: .contact, shouldBeVisible: nil) diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index a15cccf37..6019d5a4d 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -869,10 +869,8 @@ final class VisibleMessageCell: MessageCell, TappableLabelDelegate { if profilePictureView.bounds.contains(profilePictureView.convert(location, from: self)), cellViewModel.shouldShowProfile { // For open groups only attempt to start a conversation if the author has a blinded id guard cellViewModel.threadVariant != .community else { - guard - SessionId.Prefix(from: cellViewModel.authorId) == .blinded15 || - SessionId.Prefix(from: cellViewModel.authorId) == .blinded25 - else { return } + // FIXME: Add in support for opening a conversation with a 'blinded25' id + guard SessionId.Prefix(from: cellViewModel.authorId) == .blinded15 else { return } delegate?.startThread( with: cellViewModel.authorId, diff --git a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift index 5386c3207..1a0ab6ace 100644 --- a/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift +++ b/SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift @@ -3335,7 +3335,7 @@ class OpenGroupManagerSpec: QuickSpec { }.thenReturn(()) } - it("caches the promise if there is no cached promise") { + it("caches the publisher if there is no cached publisher") { let publisher = OpenGroupManager.getDefaultRoomsIfNeeded(using: dependencies) expect(mockOGMCache) @@ -3344,7 +3344,7 @@ class OpenGroupManagerSpec: QuickSpec { }) } - it("returns the cached promise if there is one") { + it("returns the cached publisher if there is one") { let uniqueRoomInstance: OpenGroupAPI.Room = OpenGroupAPI.Room( token: "UniqueId", name: "", @@ -3484,7 +3484,7 @@ class OpenGroupManagerSpec: QuickSpec { expect(TestRoomsApi.callCounter).to(equal(9)) // First attempt + 8 retries } - it("removes the cache promise if all retries fail") { + it("removes the cache publisher if all retries fail") { class TestRoomsApi: TestOnionRequestAPI { override class var mockResponse: Data? { return nil } } @@ -3626,7 +3626,7 @@ class OpenGroupManagerSpec: QuickSpec { } } - it("retrieves the image retrieval promise from the cache if it exists") { + it("retrieves the image retrieval publisher from the cache if it exists") { let publisher = Future { resolver in resolver(Result.success(Data([5, 4, 3, 2, 1]))) } @@ -3705,7 +3705,7 @@ class OpenGroupManagerSpec: QuickSpec { ) } - it("adds the image retrieval promise to the cache") { + it("adds the image retrieval publisher to the cache") { class TestNeverReturningApi: OnionRequestAPIType { static func sendOnionRequest(_ request: URLRequest, to server: String, with x25519PublicKey: String, timeout: TimeInterval) -> AnyPublisher<(ResponseInfoType, Data?), Error> { return Future<(ResponseInfoType, Data?), Error> { _ in }.eraseToAnyPublisher() diff --git a/SessionUtilitiesKitTests/General/SessionIdSpec.swift b/SessionUtilitiesKitTests/General/SessionIdSpec.swift index 0c0429bd6..62a76e33c 100644 --- a/SessionUtilitiesKitTests/General/SessionIdSpec.swift +++ b/SessionUtilitiesKitTests/General/SessionIdSpec.swift @@ -59,7 +59,7 @@ class SessionIdSpec: QuickSpec { expect(SessionId.Prefix(from: "00")).to(equal(.unblinded)) expect(SessionId.Prefix(from: "05")).to(equal(.standard)) expect(SessionId.Prefix(from: "15")).to(equal(.blinded15)) - expect(SessionId.Prefix(from: "s5")).to(equal(.blinded25)) + expect(SessionId.Prefix(from: "25")).to(equal(.blinded25)) } it("fails when nil") { From b12497e30519ed2d03e55a672f44117efdaa0131 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 21 Jul 2023 10:41:18 +1000 Subject: [PATCH 3/3] Include specific fixes from the other branch Fixed a crash with the QRCode scanner Fixed a crash when trying to take a video attachment --- Session.xcodeproj/project.pbxproj | 24 +++++++++---------- .../PhotoCapture.swift | 9 +++++-- .../Shared/QRCodeScanningViewController.swift | 7 +++++- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 8dd26fc33..979c65d60 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -6366,7 +6366,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -6390,7 +6390,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6438,7 +6438,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -6467,7 +6467,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -6503,7 +6503,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; @@ -6526,7 +6526,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension"; @@ -6577,7 +6577,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = SUQ8J2PCT7; ENABLE_NS_ASSERTIONS = NO; @@ -6605,7 +6605,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger.NotificationServiceExtension"; @@ -7537,7 +7537,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -7575,7 +7575,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; OTHER_LDFLAGS = "$(inherited)"; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; @@ -7608,7 +7608,7 @@ CODE_SIGN_ENTITLEMENTS = Session/Meta/Signal.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 419; + CURRENT_PROJECT_VERSION = 420; DEVELOPMENT_TEAM = SUQ8J2PCT7; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -7646,7 +7646,7 @@ "$(SRCROOT)", ); LLVM_LTO = NO; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.3.1; OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.loki-messenger"; PRODUCT_NAME = Session; diff --git a/Session/Media Viewing & Editing/PhotoCapture.swift b/Session/Media Viewing & Editing/PhotoCapture.swift index 6f4687e85..4ec76e04e 100644 --- a/Session/Media Viewing & Editing/PhotoCapture.swift +++ b/Session/Media Viewing & Editing/PhotoCapture.swift @@ -360,10 +360,15 @@ extension PhotoCapture: CaptureButtonDelegate { do { try strongSelf.startAudioCapture() strongSelf.captureOutput.beginVideo(delegate: strongSelf) - strongSelf.delegate?.photoCaptureDidBeginVideo(strongSelf) + + DispatchQueue.main.async { + strongSelf.delegate?.photoCaptureDidBeginVideo(strongSelf) + } } catch { - strongSelf.delegate?.photoCapture(strongSelf, processingDidError: error) + DispatchQueue.main.async { + strongSelf.delegate?.photoCapture(strongSelf, processingDidError: error) + } } } ) diff --git a/Session/Shared/QRCodeScanningViewController.swift b/Session/Shared/QRCodeScanningViewController.swift index b29db5fa5..fdc111cb0 100644 --- a/Session/Shared/QRCodeScanningViewController.swift +++ b/Session/Shared/QRCodeScanningViewController.swift @@ -110,7 +110,12 @@ class QRCodeScanningViewController: UIViewController, AVCaptureMetadataOutputObj // Set the input device to autoFocus (since we don't have the interaction setup for // doing it manually) - maybeDevice?.focusMode = .continuousAutoFocus + do { + try maybeDevice?.lockForConfiguration() + maybeDevice?.focusMode = .continuousAutoFocus + maybeDevice?.unlockForConfiguration() + } + catch {} // Device input guard