fix a bunch of crash

pull/941/head
Ryan Zhao 12 months ago
parent 0b0371e769
commit f0d48670be

@ -61,5 +61,6 @@ public enum SNMessagingKit { // Just to make the external API nice
JobRunner.add(executor: ConfigurationSyncJob.self, for: .configurationSync) JobRunner.add(executor: ConfigurationSyncJob.self, for: .configurationSync)
JobRunner.add(executor: ConfigMessageReceiveJob.self, for: .configMessageReceive) JobRunner.add(executor: ConfigMessageReceiveJob.self, for: .configMessageReceive)
JobRunner.add(executor: ExpirationUpdateJob.self, for: .expirationUpdate) JobRunner.add(executor: ExpirationUpdateJob.self, for: .expirationUpdate)
JobRunner.add(executor: GetExpirationJob.self, for: .getExpiration)
} }
} }

@ -29,6 +29,10 @@ public enum GetExpirationJob: JobExecutor {
} }
var expirationInfo: [String: TimeInterval] = details.expirationInfo var expirationInfo: [String: TimeInterval] = details.expirationInfo
guard expirationInfo.count > 0 else {
success(job, false)
return
}
let userPublicKey: String = getUserHexEncodedPublicKey() let userPublicKey: String = getUserHexEncodedPublicKey()
SnodeAPI.getSwarm(for: userPublicKey) SnodeAPI.getSwarm(for: userPublicKey)
@ -82,11 +86,9 @@ public enum GetExpirationJob: JobExecutor {
} }
if !expirationInfo.isEmpty { if !expirationInfo.isEmpty {
let updatedJob: Job? = Storage.shared.write { db in let updatedJob: Job? = try job
try job .with(nextRunTimestamp: Date().timeIntervalSince1970 + minRunFrequency)
.with(nextRunTimestamp: Date().timeIntervalSince1970 + minRunFrequency) .saved(db)
.saved(db)
}
deferred(updatedJob ?? job) deferred(updatedJob ?? job)
} }

@ -72,7 +72,8 @@ public final class JobRunner {
executionType: .concurrent, // Allow as many jobs to run at once as supported by the device executionType: .concurrent, // Allow as many jobs to run at once as supported by the device
qos: .default, qos: .default,
jobVariants: [ jobVariants: [
jobVariants.remove(.expirationUpdate) jobVariants.remove(.expirationUpdate),
jobVariants.remove(.getExpiration)
].compactMap { $0 } ].compactMap { $0 }
) )
let messageSendQueue: JobQueue = JobQueue( let messageSendQueue: JobQueue = JobQueue(

Loading…
Cancel
Save