From 027ce1604d5475a1fcabe780371c7ba21a843514 Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Fri, 23 Aug 2024 12:51:12 +1000 Subject: [PATCH] Fixed a few issues found during QA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Fixed an issue where incoming legacy group messages were failing to decrypt • Fixed an issue where decoding push notifications could result in an infinite loop • Fixed an issue where the extensions would incorrectly try to append extension logs (only want the main app to do this) • Updated the accessibility ids for the switches and radios on the privacy and disappearing message settings screens --- LibSession-Util | 2 +- Session.xcodeproj/project.pbxproj | 4 +- ...isappearingMessagesSettingsViewModel.swift | 30 +++++++-- .../Settings/PrivacySettingsViewModel.swift | 18 ++++++ .../Shared/Types/SessionCell+Accessory.swift | 25 +++++++- .../Views/SessionCell+AccessoryView.swift | 16 ++--- .../Crypto/Crypto+SessionMessagingKit.swift | 2 +- SessionUtilitiesKit/General/Logging.swift | 7 +++ .../Utilities/BencodeDecoder.swift | 62 ++++++++++++++----- .../Utilities/BencodeDecoderSpec.swift | 24 +++++++ 10 files changed, 155 insertions(+), 35 deletions(-) diff --git a/LibSession-Util b/LibSession-Util index ba7919d30..af0ab996d 160000 --- a/LibSession-Util +++ b/LibSession-Util @@ -1 +1 @@ -Subproject commit ba7919d304bfe44a75a77d418638bf82ac0b7f93 +Subproject commit af0ab996da46bcbeeea5e70831cda7e23c955243 diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 9a6999ca6..7affedd02 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -7673,7 +7673,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 474; + CURRENT_PROJECT_VERSION = 475; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -7751,7 +7751,7 @@ CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 474; + CURRENT_PROJECT_VERSION = 475; ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_NO_COMMON_BLOCKS = YES; diff --git a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift index dd7604d11..2db0b95d0 100644 --- a/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift +++ b/Session/Conversations/Settings/ThreadDisappearingMessagesSettingsViewModel.swift @@ -130,7 +130,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga id: "DISAPPEARING_MESSAGES_OFF".localized(), title: "DISAPPEARING_MESSAGES_OFF".localized(), rightAccessory: .radio( - isSelected: { (self?.currentSelection.value.isEnabled == false) } + isSelected: { (self?.currentSelection.value.isEnabled == false) }, + accessibility: Accessibility( + identifier: "Off - Radio" + ) ), accessibility: Accessibility( identifier: "Disable disappearing messages (Off option)", @@ -154,7 +157,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.type == .disappearAfterRead) - } + }, + accessibility: Accessibility( + identifier: "Disappear After Read - Radio" + ) ), accessibility: Accessibility( identifier: "Disappear after read option", @@ -184,7 +190,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.type == .disappearAfterSend) - } + }, + accessibility: Accessibility( + identifier: "Disappear After Read - Radio" + ) ), accessibility: Accessibility( identifier: "Disappear after send option", @@ -226,7 +235,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.durationSeconds == duration) - } + }, + accessibility: Accessibility( + identifier: "\(title) - Radio" + ) ), accessibility: Accessibility( identifier: "Time option", @@ -252,7 +264,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga id: "DISAPPEARING_MESSAGES_OFF".localized(), title: "DISAPPEARING_MESSAGES_OFF".localized(), rightAccessory: .radio( - isSelected: { (self?.currentSelection.value.isEnabled == false) } + isSelected: { (self?.currentSelection.value.isEnabled == false) }, + accessibility: Accessibility( + identifier: "Off - Radio" + ) ), isEnabled: ( isNoteToSelf || @@ -287,7 +302,10 @@ class ThreadDisappearingMessagesSettingsViewModel: SessionTableViewModel, Naviga isSelected: { (self?.currentSelection.value.isEnabled == true) && (self?.currentSelection.value.durationSeconds == duration) - } + }, + accessibility: Accessibility( + identifier: "\(title) - Radio" + ) ), isEnabled: (isNoteToSelf || currentUserIsClosedGroupAdmin == true), accessibility: Accessibility( diff --git a/Session/Settings/PrivacySettingsViewModel.swift b/Session/Settings/PrivacySettingsViewModel.swift index 03ac5fab5..1526e0193 100644 --- a/Session/Settings/PrivacySettingsViewModel.swift +++ b/Session/Settings/PrivacySettingsViewModel.swift @@ -114,6 +114,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .isScreenLockEnabled, value: current.isScreenLockEnabled, oldValue: (previous ?? current).isScreenLockEnabled + ), + accessibility: Accessibility( + identifier: "Lock App - Switch" ) ), onTap: { [weak self] in @@ -152,6 +155,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .checkForCommunityMessageRequests, value: current.checkForCommunityMessageRequests, oldValue: (previous ?? current).checkForCommunityMessageRequests + ), + accessibility: Accessibility( + identifier: "Community Message Requests - Switch" ) ), onTap: { [weak self] in @@ -177,6 +183,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .areReadReceiptsEnabled, value: current.areReadReceiptsEnabled, oldValue: (previous ?? current).areReadReceiptsEnabled + ), + accessibility: Accessibility( + identifier: "Read Receipts - Switch" ) ), onTap: { @@ -234,6 +243,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .typingIndicatorsEnabled, value: current.typingIndicatorsEnabled, oldValue: (previous ?? current).typingIndicatorsEnabled + ), + accessibility: Accessibility( + identifier: "Typing Indicators - Switch" ) ), onTap: { @@ -256,6 +268,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .areLinkPreviewsEnabled, value: current.areLinkPreviewsEnabled, oldValue: (previous ?? current).areLinkPreviewsEnabled + ), + accessibility: Accessibility( + identifier: "Send Link Previews - Switch" ) ), onTap: { @@ -278,6 +293,9 @@ class PrivacySettingsViewModel: SessionTableViewModel, NavigationItemSource, Nav key: .areCallsEnabled, value: current.areCallsEnabled, oldValue: (previous ?? current).areCallsEnabled + ), + accessibility: Accessibility( + identifier: "Voice and Video Calls - Switch" ) ), accessibility: Accessibility( diff --git a/Session/Shared/Types/SessionCell+Accessory.swift b/Session/Shared/Types/SessionCell+Accessory.swift index 4bacade56..fcf9f6d63 100644 --- a/Session/Shared/Types/SessionCell+Accessory.swift +++ b/Session/Shared/Types/SessionCell+Accessory.swift @@ -322,7 +322,7 @@ extension SessionCell.Accessory { // MARK: - .toggle Variants public static func toggle(_ dataSource: DataSource) -> SessionCell.Accessory { - return .toggle(dataSource, accessibility: nil) + return .toggle(dataSource, accessibility: Accessibility(identifier: "Switch")) } // MARK: - .dropDown Variants @@ -334,11 +334,30 @@ extension SessionCell.Accessory { // MARK: - .radio Variants public static func radio(isSelected: @escaping () -> Bool) -> SessionCell.Accessory { - return .radio(size: .medium, isSelected: isSelected, storedSelection: false, accessibility: nil) + return .radio( + size: .medium, + isSelected: isSelected, + storedSelection: false, + accessibility: Accessibility(identifier: "Radio") + ) + } + + public static func radio(isSelected: @escaping () -> Bool, accessibility: Accessibility) -> SessionCell.Accessory { + return .radio( + size: .medium, + isSelected: isSelected, + storedSelection: false, + accessibility: accessibility + ) } public static func radio(isSelected: @escaping () -> Bool, storedSelection: Bool) -> SessionCell.Accessory { - return .radio(size: .medium, isSelected: isSelected, storedSelection: storedSelection, accessibility: nil) + return .radio( + size: .medium, + isSelected: isSelected, + storedSelection: storedSelection, + accessibility: Accessibility(identifier: "Radio") + ) } // MARK: - .highlightingBackgroundLabel Variants diff --git a/Session/Shared/Views/SessionCell+AccessoryView.swift b/Session/Shared/Views/SessionCell+AccessoryView.swift index e724a296e..7f2a81d5a 100644 --- a/Session/Shared/Views/SessionCell+AccessoryView.swift +++ b/Session/Shared/Views/SessionCell+AccessoryView.swift @@ -380,14 +380,16 @@ extension SessionCell { let isSelected: Bool = isSelectedRetriever() let wasOldSelection: Bool = (!isSelected && storedSelection) - radioView.isAccessibilityElement = true - + radioBorderView.isAccessibilityElement = true + radioBorderView.accessibilityIdentifier = accessibility?.identifier + radioBorderView.accessibilityLabel = accessibility?.label + if isSelected || wasOldSelection { - radioView.accessibilityTraits.insert(.selected) - radioView.accessibilityValue = "selected" + radioBorderView.accessibilityTraits.insert(.selected) + radioBorderView.accessibilityValue = "selected" } else { - radioView.accessibilityTraits.remove(.selected) - radioView.accessibilityValue = nil + radioBorderView.accessibilityTraits.remove(.selected) + radioBorderView.accessibilityValue = nil } radioBorderView.isHidden = false @@ -402,8 +404,6 @@ extension SessionCell { radioBorderView.layer.cornerRadius = (size.borderSize / 2) - radioView.accessibilityIdentifier = accessibility?.identifier - radioView.accessibilityLabel = accessibility?.label radioView.alpha = (wasOldSelection ? 0.3 : 1) radioView.isHidden = (!isSelected && !storedSelection) radioView.themeBackgroundColor = { diff --git a/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift b/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift index 064185ed0..21d06eae9 100644 --- a/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift +++ b/SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift @@ -170,7 +170,7 @@ public extension Crypto.Generator { guard cX25519Pubkey.count == 32, - cX25519Seckey.count == 32, + cX25519Seckey.count == 64, session_decrypt_incoming_legacy_group( &cCiphertext, cCiphertext.count, diff --git a/SessionUtilitiesKit/General/Logging.swift b/SessionUtilitiesKit/General/Logging.swift index d3fd19692..b936ec0e6 100644 --- a/SessionUtilitiesKit/General/Logging.swift +++ b/SessionUtilitiesKit/General/Logging.swift @@ -376,6 +376,13 @@ public class Logger { return } + // We only want to append extension logs to the main app logs (so just early out if this isn't + // the main app) + guard Singleton.hasAppContext && Singleton.appContext.isMainApp else { + self?.completeResumeLogging() + return + } + DDLog.loggingQueue.async { let extensionInfo: [(dir: String, type: ExtensionType)] = [ ("\(FileManager.default.appSharedDataDirectoryPath)/Logs/NotificationExtension", .notification), diff --git a/SessionUtilitiesKit/Utilities/BencodeDecoder.swift b/SessionUtilitiesKit/Utilities/BencodeDecoder.swift index dc4bbd05f..016ec4303 100644 --- a/SessionUtilitiesKit/Utilities/BencodeDecoder.swift +++ b/SessionUtilitiesKit/Utilities/BencodeDecoder.swift @@ -536,7 +536,46 @@ extension _BencodeDecoder.SingleValueContainer: SingleValueDecodingContainer { ) } - func decode(_ type: Int.Type) throws -> Int { + func decode(_ type: String.Type) throws -> String { + guard + let decodedData = _BencodeDecoder.decodeString(data), + let result: String = decodedData.value.value + else { + throw DecodingError.dataCorrupted( + DecodingError.Context( + codingPath: codingPath, + debugDescription: "failed to decode String" + ) + ) + } + + return result + } + + func decode(_ type: Double.Type) throws -> Double { + let intValue: Int = try decodeFixedInt(Int.self) + + return Double(intValue) + } + + func decode(_ type: Float.Type) throws -> Float { + let intValue: Int = try decodeFixedInt(Int.self) + + return Float(intValue) + } + + func decode(_ type: Int.Type) throws -> Int { return try decodeFixedInt(type) } + func decode(_ type: Int8.Type) throws -> Int8 { return try decodeFixedInt(type) } + func decode(_ type: Int16.Type) throws -> Int16 { return try decodeFixedInt(type) } + func decode(_ type: Int32.Type) throws -> Int32 { return try decodeFixedInt(type) } + func decode(_ type: Int64.Type) throws -> Int64 { return try decodeFixedInt(type) } + func decode(_ type: UInt.Type) throws -> UInt { return try decodeFixedInt(type) } + func decode(_ type: UInt8.Type) throws -> UInt8 { return try decodeFixedInt(type) } + func decode(_ type: UInt16.Type) throws -> UInt16 { return try decodeFixedInt(type) } + func decode(_ type: UInt32.Type) throws -> UInt32 { return try decodeFixedInt(type) } + func decode(_ type: UInt64.Type) throws -> UInt64 { return try decodeFixedInt(type) } + + func decodeFixedInt(_ type: T.Type) throws -> T { var mutableData: Data = data var intData: [UInt8] = [] _ = mutableData.popFirst() // drop `i` @@ -548,7 +587,7 @@ extension _BencodeDecoder.SingleValueContainer: SingleValueDecodingContainer { guard let intString: String = String(data: Data(intData), encoding: .ascii), - let result: Int = Int(intString, radix: 10) + let result: T = T(intString, radix: 10) else { throw DecodingError.dataCorrupted( DecodingError.Context( @@ -561,23 +600,18 @@ extension _BencodeDecoder.SingleValueContainer: SingleValueDecodingContainer { return result } - func decode(_ type: String.Type) throws -> String { - guard - let decodedData = _BencodeDecoder.decodeString(data), - let result: String = decodedData.value.value - else { - throw DecodingError.dataCorrupted( + func decode(_ type: T.Type) throws -> T where T: Decodable { + if T.self is any FixedWidthInteger.Type { + // This will be handled by the integer-specific decode function + throw DecodingError.typeMismatch( + T.self, DecodingError.Context( codingPath: codingPath, - debugDescription: "failed to decode String" + debugDescription: "attempted to use generic decode function instead of integer-specific one for integer type" ) ) } - - return result - } - - func decode(_ type: T.Type) throws -> T where T: Decodable { + let decoder = _BencodeDecoder(data: data, userInfo: userInfo) let value = try T(from: decoder) diff --git a/SessionUtilitiesKitTests/Utilities/BencodeDecoderSpec.swift b/SessionUtilitiesKitTests/Utilities/BencodeDecoderSpec.swift index c7db6ff53..7875531c3 100644 --- a/SessionUtilitiesKitTests/Utilities/BencodeDecoderSpec.swift +++ b/SessionUtilitiesKitTests/Utilities/BencodeDecoderSpec.swift @@ -99,6 +99,30 @@ class BencodeDecoderSpec: QuickSpec { try BencodeDecoder().decode(TestType2.self, from: data) }.to(throwError(DecodingError.typeMismatch(Bool.self, DecodingError.Context(codingPath: [], debugDescription: "Bencode doesn't support Bool values, use an Int and custom Encode/Decode functions isntead")))) } + + // MARK: ---- does not end up in an infinite loop when decoding Int64 types + it("does not end up in an infinite loop when decoding Int64 types") { + let basicIntListData: Data = "li1ei2ee".data(using: .utf8)! + let result = try? BencodeDecoder().decode([Int64].self, from: basicIntListData) + + expect(result).to(equal([1, 2])) + } + + // MARK: ---- does not end up in an infinite loop when decoding Double types + it("does not end up in an infinite loop when decoding Double types") { + let basicIntListData: Data = "li1ei2ee".data(using: .utf8)! + let result = try? BencodeDecoder().decode([Double].self, from: basicIntListData) + + expect(result).to(equal([1, 2])) + } + + // MARK: ---- does not end up in an infinite loop when decoding Float types + it("does not end up in an infinite loop when decoding Float types") { + let basicIntListData: Data = "li1ei2ee".data(using: .utf8)! + let result = try? BencodeDecoder().decode([Float].self, from: basicIntListData) + + expect(result).to(equal([1, 2])) + } } } }