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

Fixed a crash which could occur when receiving a UserGroups config change

Browse Source
pull/1053/head
Morgan Pretty 10 months ago
parent 4f86ea7a71
commit 22e59b1789
25 changed files with 247 additions and 167 deletions
Show Stats Download Patch File Download Diff File

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

@ -842,6 +842,7 @@
FDC13D562A171FE4007267C7 /* UnsubscribeRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC13D552A171FE4007267C7 /* UnsubscribeRequest.swift */; };
FDC13D582A17207D007267C7 /* UnsubscribeResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC13D572A17207D007267C7 /* UnsubscribeResponse.swift */; };
FDC13D5A2A1721C5007267C7 /* LegacyNotifyRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC13D592A1721C5007267C7 /* LegacyNotifyRequest.swift */; };
FDC1BD662CFD6C4F002CDC71 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC1BD652CFD6C4E002CDC71 /* Config.swift */; };
FDC289422C86AB5800020BC2 /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = FDC289412C86AB5800020BC2 /* GRDB */; };
FDC289472C881A3800020BC2 /* MutableIdentifiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC289462C881A3800020BC2 /* MutableIdentifiable.swift */; };
FDC2908727D7047F005DAE71 /* RoomSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDC2908627D7047F005DAE71 /* RoomSpec.swift */; };
@ -1966,6 +1967,7 @@
FDC13D552A171FE4007267C7 /* UnsubscribeRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsubscribeRequest.swift; sourceTree = "<group>"; };
FDC13D572A17207D007267C7 /* UnsubscribeResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnsubscribeResponse.swift; sourceTree = "<group>"; };
FDC13D592A1721C5007267C7 /* LegacyNotifyRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyNotifyRequest.swift; sourceTree = "<group>"; };
FDC1BD652CFD6C4E002CDC71 /* Config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
FDC289462C881A3800020BC2 /* MutableIdentifiable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutableIdentifiable.swift; sourceTree = "<group>"; };
FDC2908627D7047F005DAE71 /* RoomSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomSpec.swift; sourceTree = "<group>"; };
FDC2908827D70656005DAE71 /* RoomPollInfoSpec.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RoomPollInfoSpec.swift; sourceTree = "<group>"; };
@ -4168,8 +4170,9 @@
FD8ECF7529340F4800C0D1BB /* LibSession */ = {
isa = PBXGroup;
children = (
FD2B4B022949886900AB4848 /* Database */,
FD8ECF8E29381FB200C0D1BB /* Config Handling */,
FD2B4B022949886900AB4848 /* Database */,
FDC1BD642CFD6C44002CDC71 /* Types */,
FD8ECF7A29340FFD00C0D1BB /* LibSession+SessionMessagingKit.swift */,
);
path = LibSession;
@ -4254,6 +4257,14 @@
path = Types;
sourceTree = "<group>";
};
FDC1BD642CFD6C44002CDC71 /* Types */ = {
isa = PBXGroup;
children = (
FDC1BD652CFD6C4E002CDC71 /* Config.swift */,
);
path = Types;
sourceTree = "<group>";
};
FDC289482C881C5500020BC2 /* LibSession */ = {
isa = PBXGroup;
children = (
@ -5997,6 +6008,7 @@
FD5C72FD284F0EC90029977D /* MessageReceiver+ExpirationTimers.swift in Sources */,
C32C5A88256DBCF9003C73A2 /* MessageReceiver+ClosedGroups.swift in Sources */,
B8D0A25925E367AC00C1835E /* Notification+MessageReceiver.swift in Sources */,
FDC1BD662CFD6C4F002CDC71 /* Config.swift in Sources */,
FD245C53285065DB00B966DD /* ProximityMonitoringManager.swift in Sources */,
FD245C55285065E500B966DD /* OpenGroupManager.swift in Sources */,
C32C599E256DB02B003C73A2 /* TypingIndicators.swift in Sources */,

6
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -1273,7 +1273,7 @@ extension ConversationVC:
id: sessionId,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
}
@ -1309,7 +1309,7 @@ extension ConversationVC:
id: (lookup.sessionId ?? lookup.blindedId),
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
).id
}
@ -1766,7 +1766,7 @@ extension ConversationVC:
roomToken: room,
server: server,
publicKey: publicKey,
calledFromConfigHandling: false
calledFromConfig: nil
)
}
.flatMap { successfullyAddedGroup in

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

@ -781,7 +781,7 @@ class ThreadSettingsViewModel: SessionTableViewModel, NavigationItemSource, Navi
id: userId,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

2
Session/Home/GlobalSearch/GlobalSearchViewController.swift
Unescape Escape View File

@ -399,7 +399,7 @@ extension GlobalSearchViewController {
id: threadId,
variant: threadVariant,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
}

2
Session/Meta/SessionApp.swift
Unescape Escape View File

@ -90,7 +90,7 @@ public struct SessionApp {
id: threadId,
variant: variant,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
}

2
Session/Notifications/PushRegistrationManager.swift
Unescape Escape View File

@ -318,7 +318,7 @@ public class PushRegistrationManager: NSObject, PKPushRegistryDelegate, PushRegi
id: caller,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

2
Session/Onboarding/Onboarding.swift
Unescape Escape View File

@ -175,7 +175,7 @@ enum Onboarding {
id: x25519PublicKey,
variant: .contact,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(false)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

2
Session/Open Groups/JoinOpenGroupVC.swift
Unescape Escape View File

@ -206,7 +206,7 @@ final class JoinOpenGroupVC: BaseVC, UIPageViewControllerDataSource, UIPageViewC
roomToken: roomToken,
server: server,
publicKey: publicKey,
calledFromConfigHandling: false
calledFromConfig: nil
)
}
.flatMap { successfullyAddedGroup in

8
Session/Utilities/MockDataGenerator.swift
Unescape Escape View File

@ -54,7 +54,7 @@ enum MockDataGenerator {
id: "MockDatabaseThread",
variant: .contact,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(false)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
@ -85,7 +85,7 @@ enum MockDataGenerator {
id: randomSessionId,
variant: .contact,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(true)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
@ -198,7 +198,7 @@ enum MockDataGenerator {
id: randomGroupPublicKey,
variant: .legacyGroup,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(true)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
_ = try! ClosedGroup(
@ -329,7 +329,7 @@ enum MockDataGenerator {
id: randomGroupPublicKey,
variant: .community,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(true)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
_ = try! OpenGroup(

2
SessionMessagingKit/Database/Migrations/_013_SessionUtilChanges.swift
Unescape Escape View File

@ -248,7 +248,7 @@ enum _013_SessionUtilChanges: Migration {
id: userPublicKey,
variant: .contact,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(false)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
}

9
SessionMessagingKit/Database/Models/SessionThread.swift
Unescape Escape View File

@ -202,7 +202,7 @@ public extension SessionThread {
id: ID,
variant: Variant,
values: TargetValues,
calledFromConfig: Bool,
calledFromConfig configTriggeringChange: LibSession.Config.Variant?,
using dependencies: Dependencies
) throws -> SessionThread {
var result: SessionThread
@ -215,6 +215,7 @@ public extension SessionThread {
db,
threadId: id,
threadVariant: variant,
conf: configTriggeringChange?.conf,
using: dependencies
)
@ -239,13 +240,14 @@ public extension SessionThread {
)
case (_, .useLibSession): // Create and save the config from libSession
guard !calledFromConfig else { throw LibSessionError.invalidConfigAccess }
guard configTriggeringChange == nil else { throw LibSessionError.invalidConfigAccess }
try LibSession
.disappearingMessagesConfig(
db,
threadId: id,
threadVariant: variant,
conf: configTriggeringChange?.conf,
using: dependencies
)?
.upserted(db)
@ -268,6 +270,7 @@ public extension SessionThread {
db,
threadId: id,
threadVariant: variant,
conf: configTriggeringChange?.conf,
using: dependencies
)
let libSessionShouldBeVisible: Bool = LibSession.shouldBeVisible(priority: targetPriority)
@ -305,7 +308,7 @@ public extension SessionThread {
.updateAllAndConfig(
db,
requiredChanges,
calledFromConfig: calledFromConfig,
calledFromConfig: (configTriggeringChange != nil),
using: dependencies
)

4
SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift
Unescape Escape View File

@ -39,7 +39,7 @@ internal extension LibSession {
using dependencies: Dependencies
) throws {
guard mergeNeedsDump else { return }
guard conf != nil else { throw LibSessionError.nilConfigObject }
guard let conf: UnsafeMutablePointer<config_object> = conf else { throw LibSessionError.nilConfigObject }
// The current users contact data is handled separately so exclude it if it's present (as that's
// actually a bug)
@ -178,7 +178,7 @@ internal extension LibSession {
.useExisting
)
),
calledFromConfig: true,
calledFromConfig: .contacts(conf),
using: dependencies
)

36
SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift
Unescape Escape View File

@ -410,6 +410,7 @@ public extension LibSession {
_ db: Database,
threadId: String,
threadVariant: SessionThread.Variant,
conf: UnsafeMutablePointer<config_object>?,
using dependencies: Dependencies
) -> Int32 {
let userPublicKey: String = getUserHexEncodedPublicKey(db)
@ -420,10 +421,22 @@ public extension LibSession {
}
}()
guard let conf: UnsafeMutablePointer<config_object> = conf else {
return dependencies.caches[.libSession]
.config(for: configVariant, publicKey: userPublicKey)
.wrappedValue
.map { conf in
LibSession.pinnedPriority(
db,
threadId: threadId,
threadVariant: threadVariant,
conf: conf,
using: dependencies
)
}
.defaulting(to: LibSession.defaultNewThreadPriority)
}
guard var cThreadId: [CChar] = threadId.cString(using: .utf8) else {
return LibSession.defaultNewThreadPriority
}
@ -475,15 +488,14 @@ public extension LibSession {
return LibSession.defaultNewThreadPriority // FIXME: Add in groups rebuild
}
}
.defaulting(to: LibSession.defaultNewThreadPriority)
}
static func disappearingMessagesConfig(
_ db: Database,
threadId: String,
threadVariant: SessionThread.Variant,
conf: UnsafeMutablePointer<config_object>?,
using dependencies: Dependencies
) throws -> DisappearingMessagesConfiguration? {
) -> DisappearingMessagesConfiguration? {
switch threadVariant {
case .community: return nil
default: break
@ -497,10 +509,21 @@ public extension LibSession {
}
}()
guard let conf: UnsafeMutablePointer<config_object> = conf else {
return dependencies.caches[.libSession]
.config(for: configVariant, publicKey: userPublicKey)
.wrappedValue
.map { conf -> DisappearingMessagesConfiguration? in
.map { conf in
LibSession.disappearingMessagesConfig(
db,
threadId: threadId,
threadVariant: threadVariant,
conf: conf,
using: dependencies
)
}
}
guard var cThreadId: [CChar] = threadId.cString(using: .utf8) else { return nil }
switch threadVariant {
@ -556,7 +579,6 @@ public extension LibSession {
return nil // FIXME: Add in groups rebuild
}
}
}
static func conversationInConfig(
_ db: Database? = nil,
@ -565,8 +587,8 @@ public extension LibSession {
visibleOnly: Bool,
using dependencies: Dependencies
) -> Bool {
// Currently blinded conversations cannot be contained in the config, so there is no point checking (it'll always be
// false)
// Currently blinded conversations cannot be contained in the config, so there is no
// point checking (it'll always be false)
guard
threadVariant == .community || (
(try? SessionId(from: threadId))?.prefix != .blinded15 &&

9
SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift
Unescape Escape View File

@ -32,7 +32,7 @@ internal extension LibSession {
using dependencies: Dependencies = Dependencies()
) throws {
guard mergeNeedsDump else { return }
guard conf != nil else { throw LibSessionError.nilConfigObject }
guard let conf: UnsafeMutablePointer<config_object> = conf else { throw LibSessionError.nilConfigObject }
var infiniteLoopGuard: Int = 0
var communities: [PrioritisedData<OpenGroupUrlInfo>] = []
@ -133,13 +133,12 @@ internal extension LibSession {
// Add any new communities (via the OpenGroupManager)
communities.forEach { community in
let successfullyAddedGroup: Bool = OpenGroupManager.shared
.add(
let successfullyAddedGroup: Bool = OpenGroupManager.shared.add(
db,
roomToken: community.data.roomToken,
server: community.data.server,
publicKey: community.data.publicKey,
calledFromConfigHandling: true
calledFromConfig: .userGroups(conf)
)
if successfullyAddedGroup {
@ -241,7 +240,7 @@ internal extension LibSession {
admins: updatedAdmins.map { $0.profileId },
expirationTimer: UInt32(group.disappearingConfig?.durationSeconds ?? 0),
formationTimestampMs: UInt64(joinedAt * 1000),
calledFromConfigHandling: true,
calledFromConfig: .userGroups(conf),
using: dependencies
)
}

4
SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift
Unescape Escape View File

@ -28,7 +28,7 @@ internal extension LibSession {
typealias ProfileData = (profileName: String, profilePictureUrl: String?, profilePictureKey: Data?)
guard mergeNeedsDump else { return }
guard conf != nil else { throw LibSessionError.nilConfigObject }
guard let conf: UnsafeMutablePointer<config_object> = conf else { throw LibSessionError.nilConfigObject }
// A profile must have a name so if this is null then it's invalid and can be ignored
guard let profileNamePtr: UnsafePointer<CChar> = user_profile_get_name(conf) else { return }
@ -106,7 +106,7 @@ internal extension LibSession {
shouldBeVisible: .setTo(LibSession.shouldBeVisible(priority: targetPriority)),
pinnedPriority: .setTo(targetPriority)
),
calledFromConfig: true,
calledFromConfig: .userProfile(conf),
using: dependencies
)
}

28
SessionMessagingKit/LibSession/Types/Config.swift
Unescape Escape View File

@ -0,0 +1,28 @@
// Copyright © 2023 Rangeproof Pty Ltd. All rights reserved.
//
// stringlint:disable
import Foundation
import SessionUtil
import SessionUtilitiesKit
public extension LibSession {
// MARK: - Config
enum Config {
public enum Variant {
case userProfile(UnsafeMutablePointer<config_object>)
case contacts(UnsafeMutablePointer<config_object>)
case convoInfoVolatile(UnsafeMutablePointer<config_object>)
case userGroups(UnsafeMutablePointer<config_object>)
var conf: UnsafeMutablePointer<config_object> {
switch self {
case .userProfile(let value), .contacts(let value),
.convoInfoVolatile(let value), .userGroups(let value):
return value
}
}
}
}
}

10
SessionMessagingKit/Open Groups/OpenGroupManager.swift
Unescape Escape View File

@ -180,12 +180,12 @@ public final class OpenGroupManager {
roomToken: String,
server: String,
publicKey: String,
calledFromConfigHandling: Bool,
calledFromConfig configTriggeringChange: LibSession.Config.Variant?,
using dependencies: Dependencies = Dependencies()
) -> Bool {
// If we are currently polling for this server and already have a TSGroupThread for this room the do nothing
if hasExistingOpenGroup(db, roomToken: roomToken, server: server, publicKey: publicKey, using: dependencies) {
SNLog("Ignoring join open group attempt (already joined), user initiated: \(!calledFromConfigHandling)")
SNLog("Ignoring join open group attempt (already joined), user initiated: \(configTriggeringChange != nil)")
return false
}
@ -211,9 +211,9 @@ public final class OpenGroupManager {
///
/// **Note:** We **MUST** provide a `nil` value if this method was called from the config handling as updating
/// the `shouldVeVisible` state can trigger a config update which could result in an infinite loop in the future
shouldBeVisible: (calledFromConfigHandling ? .useExisting : .setTo(true))
shouldBeVisible: (configTriggeringChange != nil ? .useExisting : .setTo(true))
),
calledFromConfig: calledFromConfigHandling,
calledFromConfig: configTriggeringChange,
using: dependencies
)
@ -225,7 +225,7 @@ public final class OpenGroupManager {
// Set the group to active and reset the sequenceNumber (handle groups which have
// been deactivated)
if calledFromConfigHandling {
if configTriggeringChange != nil {
_ = try? OpenGroup
.filter(id: OpenGroup.idFor(roomToken: roomToken, server: targetServer))
.updateAll( // Handling a config update so don't use `updateAllAndConfig`

4
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+Calls.swift
Unescape Escape View File

@ -65,7 +65,7 @@ extension MessageReceiver {
id: sender,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
@ -92,7 +92,7 @@ extension MessageReceiver {
id: sender,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

10
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+ClosedGroups.swift
Unescape Escape View File

@ -121,7 +121,7 @@ extension MessageReceiver {
admins: adminsAsData.map { $0.toHexString() },
expirationTimer: expirationTimer,
formationTimestampMs: sentTimestamp,
calledFromConfigHandling: false,
calledFromConfig: nil,
using: dependencies
)
}
@ -135,7 +135,7 @@ extension MessageReceiver {
admins: [String],
expirationTimer: UInt32,
formationTimestampMs: UInt64,
calledFromConfigHandling: Bool,
calledFromConfig configTriggeringChange: LibSession.Config.Variant?,
using dependencies: Dependencies
) throws {
// With new closed groups we only want to create them if the admin creating the closed group is an
@ -153,7 +153,7 @@ extension MessageReceiver {
// If the group came from the updated config handling then it doesn't matter if we
// have an approved admin - we should add it regardless (as it's been synced from
// antoher device)
guard hasApprovedAdmin || calledFromConfigHandling else { return }
guard hasApprovedAdmin || configTriggeringChange != nil else { return }
// Create the group
let thread: SessionThread = try SessionThread.upsert(
@ -164,7 +164,7 @@ extension MessageReceiver {
creationDateTimestamp: (TimeInterval(formationTimestampMs) / 1000),
shouldBeVisible: .setTo(true)
),
calledFromConfig: calledFromConfigHandling,
calledFromConfig: configTriggeringChange,
using: dependencies
)
let closedGroup: ClosedGroup = try ClosedGroup(
@ -226,7 +226,7 @@ extension MessageReceiver {
try newKeyPair.insert(db)
}
if !calledFromConfigHandling {
if configTriggeringChange == nil {
// Update libSession
try? LibSession.add(
db,

2
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+MessageRequests.swift
Unescape Escape View File

@ -55,7 +55,7 @@ extension MessageReceiver {
id: senderId,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

2
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
Unescape Escape View File

@ -72,7 +72,7 @@ extension MessageReceiver {
id: threadId,
variant: threadVariant,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
let maybeOpenGroup: OpenGroup? = {

6
SessionMessagingKit/Sending & Receiving/Message Handling/MessageSender+ClosedGroups.swift
Unescape Escape View File

@ -45,7 +45,7 @@ extension MessageSender {
id: groupPublicKey,
variant: .legacyGroup,
values: SessionThread.TargetValues(shouldBeVisible: .setTo(true)),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
try ClosedGroup(
@ -483,7 +483,7 @@ extension MessageSender {
id: member,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
@ -697,7 +697,7 @@ extension MessageSender {
id: publicKey,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
let ciphertext = try dependencies.crypto.tryGenerate(

2
SessionMessagingKitTests/Jobs/Types/MessageSendJobSpec.swift
Unescape Escape View File

@ -71,7 +71,7 @@ class MessageSendJobSpec: QuickSpec {
// False is the default and will mean we don't need libSession loaded
shouldBeVisible: .setTo(false)
),
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)
},

24
SessionMessagingKitTests/Open Groups/OpenGroupManagerSpec.swift
Unescape Escape View File

@ -764,7 +764,11 @@ class OpenGroupManagerSpec: QuickSpec {
roomToken: "testRoom",
server: "http://127.0.0.1",
publicKey: TestConstants.serverPublicKey,
calledFromConfigHandling: true, // Don't trigger LibSession logic
calledFromConfig: .userGroups( // Don't trigger LibSession logic
dependencies.caches[.libSession]
.config(for: .userGroups, publicKey: "05\(TestConstants.publicKey)")
.wrappedValue!
),
using: dependencies
)
}
@ -802,7 +806,11 @@ class OpenGroupManagerSpec: QuickSpec {
roomToken: "testRoom",
server: "http://127.0.0.1",
publicKey: TestConstants.serverPublicKey,
calledFromConfigHandling: true, // Don't trigger LibSession logic
calledFromConfig: .userGroups( // Don't trigger LibSession logic
dependencies.caches[.libSession]
.config(for: .userGroups, publicKey: "05\(TestConstants.publicKey)")
.wrappedValue!
),
using: dependencies
)
}
@ -849,7 +857,11 @@ class OpenGroupManagerSpec: QuickSpec {
publicKey: TestConstants.serverPublicKey
.replacingOccurrences(of: "c3", with: "00")
.replacingOccurrences(of: "b3", with: "00"),
calledFromConfigHandling: true, // Don't trigger LibSession logic
calledFromConfig: .userGroups( // Don't trigger LibSession logic
dependencies.caches[.libSession]
.config(for: .userGroups, publicKey: "05\(TestConstants.publicKey)")
.wrappedValue!
),
using: dependencies
)
}
@ -914,7 +926,11 @@ class OpenGroupManagerSpec: QuickSpec {
roomToken: "testRoom",
server: "http://127.0.0.1",
publicKey: TestConstants.serverPublicKey,
calledFromConfigHandling: true, // Don't trigger LibSession logic
calledFromConfig: .userGroups( // Don't trigger LibSession logic
dependencies.caches[.libSession]
.config(for: .userGroups, publicKey: "05\(TestConstants.publicKey)")
.wrappedValue!
),
using: dependencies
)
}

2
SessionNotificationServiceExtension/NotificationServiceExtension.swift
Unescape Escape View File

@ -169,7 +169,7 @@ public final class NotificationServiceExtension: UNNotificationServiceExtension
id: sender,
variant: .contact,
values: .existingOrDefault,
calledFromConfig: false,
calledFromConfig: nil,
using: dependencies
)

Write Preview
Loading…
Cancel
Save