keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1014 from oxen-io/dev

Browse Source 
Release 2.7.2 RC2
master 2.7.2
Morgan Pretty 8 months ago committed by GitHub
parent 858ab95e22 39e7005be9
commit ecfa3d42ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
LibSession-Util

@ -1 +1 @@
Subproject commit af0ab996da46bcbeeea5e70831cda7e23c955243 Subproject commit 2bf8c81443494f227a9509ddd95889f196b668d6

4
Session.xcodeproj/project.pbxproj
Unescape Escape View File

@ -7673,7 +7673,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 476; CURRENT_PROJECT_VERSION = 478;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES; ENABLE_TESTABILITY = YES;
@ -7751,7 +7751,7 @@
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES; CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_IDENTITY = "iPhone Distribution";
CURRENT_PROJECT_VERSION = 476; CURRENT_PROJECT_VERSION = 478;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_NO_COMMON_BLOCKS = YES; GCC_NO_COMMON_BLOCKS = YES;

9
Session/Conversations/Settings/ThreadSettingsViewModel.swift
Unescape Escape View File

@ -588,7 +588,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
.boolValue( .boolValue(
threadViewModel.threadOnlyNotifyForMentions == true, threadViewModel.threadOnlyNotifyForMentions == true,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadOnlyNotifyForMentions == true) oldValue: ((previous?.threadViewModel ?? threadViewModel).threadOnlyNotifyForMentions == true)
) ),
accessibility: Accessibility(identifier: "Notify for Mentions Only - Switch")
), ),
isEnabled: ( isEnabled: (
( (
@ -629,7 +630,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
.boolValue( .boolValue(
threadViewModel.threadMutedUntilTimestamp != nil, threadViewModel.threadMutedUntilTimestamp != nil,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadMutedUntilTimestamp != nil) oldValue: ((previous?.threadViewModel ?? threadViewModel).threadMutedUntilTimestamp != nil)
) ),
accessibility: Accessibility(identifier: "Mute - Switch")
), ),
isEnabled: ( isEnabled: (
( (
@ -678,7 +680,8 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
.boolValue( .boolValue(
threadViewModel.threadIsBlocked == true, threadViewModel.threadIsBlocked == true,
oldValue: ((previous?.threadViewModel ?? threadViewModel).threadIsBlocked == true) oldValue: ((previous?.threadViewModel ?? threadViewModel).threadIsBlocked == true)
) ),
accessibility: Accessibility(identifier: "Block This User - Switch")
), ),
accessibility: Accessibility( accessibility: Accessibility(
identifier: "\(ThreadSettingsViewModel.self).block", identifier: "\(ThreadSettingsViewModel.self).block",

6
SessionMessagingKit/Crypto/Crypto+SessionMessagingKit.swift
Unescape Escape View File

@ -168,9 +168,13 @@ public extension Crypto.Generator {
var maybePlaintext: UnsafeMutablePointer<UInt8>? = nil var maybePlaintext: UnsafeMutablePointer<UInt8>? = nil
var plaintextLen: Int = 0 var plaintextLen: Int = 0
// Note: We should only need a 32 byte key but there was a bug in 2.7.1 where we
// started generating 64 byte keys so, in order to support those, we accept allow
// both and the C code just takes the first 32 bytes (which is all that is needed
// from the 64 byte key anyway)
guard guard
cX25519Pubkey.count == 32, cX25519Pubkey.count == 32,
cX25519Seckey.count == 64, (cX25519Seckey.count == 32 || cX25519Seckey.count == 64),
session_decrypt_incoming_legacy_group( session_decrypt_incoming_legacy_group(
&cCiphertext, &cCiphertext,
cCiphertext.count, cCiphertext.count,

2
SessionUtilitiesKit/Crypto/Crypto+SessionUtilitiesKit.swift
Unescape Escape View File

@ -55,7 +55,7 @@ public extension Crypto.Generator {
static func x25519KeyPair() -> Crypto.Generator<KeyPair> { static func x25519KeyPair() -> Crypto.Generator<KeyPair> {
return Crypto.Generator<KeyPair>(id: "x25519KeyPair") { () -> KeyPair in return Crypto.Generator<KeyPair>(id: "x25519KeyPair") { () -> KeyPair in
var pubkey: [UInt8] = [UInt8](repeating: 0, count: 32) var pubkey: [UInt8] = [UInt8](repeating: 0, count: 32)
var seckey: [UInt8] = [UInt8](repeating: 0, count: 64) var seckey: [UInt8] = [UInt8](repeating: 0, count: 32)
guard session_curve25519_key_pair(&pubkey, &seckey) else { throw CryptoError.keyGenerationFailed } guard session_curve25519_key_pair(&pubkey, &seckey) else { throw CryptoError.keyGenerationFailed }

Write Preview
Loading…
Cancel
Save