mirror of https://github.com/oxen-io/session-ios
Fixed some issues found during debugging & QA issues
• Added code to schedule any missing recurring jobs (so we no longer need to worry that the jobs have been lost or the migrations that added them ran correctly in their final state) • Added the 'FailedGroupInvitesAndPromotionsJob' to flag invites/promotions which weren't sent before the app closed as failed • Updated to the latest libweb • Updated to the latest libSession • Updated the config sync job to delay marking itself as failed if the network is not connected (it'll now observer the network status and trigger the failure callback when reconnected, which will result in another sync attempt shortly after - this will prevent a disabled network from building up the failure count excessively causing sync delays) • Fixed a bad memory race condition which could occur with the new `Storage.performOperation` logicpull/894/head
Morgan Pretty
2 months ago
parent
44b1d69551
commit
8bb51968f0
@ -1 +1 @@
|
||||
Subproject commit 20c82402971a20a2b0026558aced68790a6fc2a0
|
||||
Subproject commit 9935bbe0137423f39e3a2292268f180a043db94d
|
||||
@ -1,2 +0,0 @@
|
||||
# Exclude all code in the libwebp module from the Address Sanitiser (otherwise it won't build)
|
||||
module:libwebp
|
||||
@ -0,0 +1,74 @@
|
||||
// Copyright © 2025 Rangeproof Pty Ltd. All rights reserved.
|
||||
|
||||
import Foundation
|
||||
import Combine
|
||||
import GRDB
|
||||
import SessionUtilitiesKit
|
||||
|
||||
// MARK: - Log.Category
|
||||
|
||||
private extension Log.Category {
|
||||
static let cat: Log.Category = .create("FailedGroupInvitesAndPromotionsJob", defaultLevel: .info)
|
||||
}
|
||||
|
||||
// MARK: - FailedGroupInvitesAndPromotionsJob
|
||||
|
||||
public enum FailedGroupInvitesAndPromotionsJob: JobExecutor {
|
||||
public static let maxFailureCount: Int = -1
|
||||
public static let requiresThreadId: Bool = false
|
||||
public static let requiresInteractionId: Bool = false
|
||||
|
||||
public static func run<S: Scheduler>(
|
||||
_ job: Job,
|
||||
scheduler: S,
|
||||
success: @escaping (Job, Bool) -> Void,
|
||||
failure: @escaping (Job, Error, Bool) -> Void,
|
||||
deferred: @escaping (Job) -> Void,
|
||||
using dependencies: Dependencies
|
||||
) {
|
||||
guard Identity.userExists(using: dependencies) else { return success(job, false) }
|
||||
guard !dependencies[cache: .libSession].isEmpty else {
|
||||
return failure(job, JobRunnerError.missingRequiredDetails, false)
|
||||
}
|
||||
|
||||
var invitationsCount: Int = -1
|
||||
var promotionsCount: Int = -1
|
||||
|
||||
// Update all 'sending' message states to 'failed'
|
||||
dependencies[singleton: .storage]
|
||||
.writePublisher { db in
|
||||
invitationsCount = try GroupMember
|
||||
.filter(
|
||||
GroupMember.Columns.groupId > SessionId.Prefix.group.rawValue &&
|
||||
GroupMember.Columns.groupId < SessionId.Prefix.group.endOfRangeString
|
||||
)
|
||||
.filter(GroupMember.Columns.role == GroupMember.Role.standard)
|
||||
.filter(GroupMember.Columns.roleStatus == GroupMember.RoleStatus.sending)
|
||||
.updateAllAndConfig(
|
||||
db,
|
||||
GroupMember.Columns.roleStatus.set(to: GroupMember.RoleStatus.failed),
|
||||
using: dependencies
|
||||
)
|
||||
promotionsCount = try GroupMember
|
||||
.filter(
|
||||
GroupMember.Columns.groupId > SessionId.Prefix.group.rawValue &&
|
||||
GroupMember.Columns.groupId < SessionId.Prefix.group.endOfRangeString
|
||||
)
|
||||
.filter(GroupMember.Columns.role == GroupMember.Role.admin)
|
||||
.filter(GroupMember.Columns.roleStatus == GroupMember.RoleStatus.sending)
|
||||
.updateAllAndConfig(
|
||||
db,
|
||||
GroupMember.Columns.roleStatus.set(to: GroupMember.RoleStatus.failed),
|
||||
using: dependencies
|
||||
)
|
||||
}
|
||||
.subscribe(on: scheduler, using: dependencies)
|
||||
.receive(on: scheduler, using: dependencies)
|
||||
.sinkUntilComplete(
|
||||
receiveCompletion: { _ in
|
||||
Log.info(.cat, "Invites marked as failed: \(invitationsCount), Promotions marked as failed: \(promotionsCount)")
|
||||
success(job, false)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue