swift5: void promise must take void argument vs no argument

pull/2/head
Michael Kirk 6 years ago
parent 30266bf65e
commit b1e1020eb3

@ -83,10 +83,10 @@ public class AccountManager: NSObject {
private func registerForTextSecure(verificationCode: String, private func registerForTextSecure(verificationCode: String,
pin: String?) -> Promise<Void> { pin: String?) -> Promise<Void> {
return Promise<Any> { resolver in return Promise { resolver in
tsAccountManager.verifyAccount(withCode: verificationCode, tsAccountManager.verifyAccount(withCode: verificationCode,
pin: pin, pin: pin,
success: resolver.fulfill, success: { resolver.fulfill(()) },
failure: resolver.reject) failure: resolver.reject)
} }
} }
@ -106,10 +106,10 @@ public class AccountManager: NSObject {
// MARK: Message Delivery // MARK: Message Delivery
func updatePushTokens(pushToken: String, voipToken: String) -> Promise<Void> { func updatePushTokens(pushToken: String, voipToken: String) -> Promise<Void> {
return Promise<Any> { resolver in return Promise { resolver in
tsAccountManager.registerForPushNotifications(pushToken: pushToken, tsAccountManager.registerForPushNotifications(pushToken: pushToken,
voipToken: voipToken, voipToken: voipToken,
success: resolver.fulfill, success: { resolver.fulfill(()) },
failure: resolver.reject) failure: resolver.reject)
} }
} }

@ -10,9 +10,9 @@ public extension MessageSender {
/** /**
* Wrap message sending in a Promise for easier callback chaining. * Wrap message sending in a Promise for easier callback chaining.
*/ */
public func sendPromise(message: TSOutgoingMessage) -> Promise<Void> { func sendPromise(message: TSOutgoingMessage) -> Promise<Void> {
let promise: Promise<Void> = Promise<Any> { resolver in let promise: Promise<Void> = Promise { resolver in
self.send(message, success: resolver.fulfill, failure: resolver.reject) self.send(message, success: { resolver.fulfill(()) }, failure: resolver.reject)
} }
// Ensure sends complete before they're GC'd. // Ensure sends complete before they're GC'd.

@ -13,13 +13,13 @@ public extension YapDatabaseConnection {
} }
func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> Promise<Void> { func readWritePromise(_ block: @escaping (YapDatabaseReadWriteTransaction) -> Void) -> Promise<Void> {
return Promise<Any> { resolver in return Promise { resolver in
self.asyncReadWrite(block, completionBlock: resolver.fulfill) self.asyncReadWrite(block, completionBlock: { resolver.fulfill(()) })
} }
} }
func read(_ block: @escaping (YapDatabaseReadTransaction) throws -> Void) throws { func read(_ block: @escaping (YapDatabaseReadTransaction) throws -> Void) throws {
var errorToRaise: Error? = nil var errorToRaise: Error?
read { transaction in read { transaction in
do { do {
@ -35,7 +35,7 @@ public extension YapDatabaseConnection {
} }
func readWrite(_ block: @escaping (YapDatabaseReadWriteTransaction) throws -> Void) throws { func readWrite(_ block: @escaping (YapDatabaseReadWriteTransaction) throws -> Void) throws {
var errorToRaise: Error? = nil var errorToRaise: Error?
readWrite { transaction in readWrite { transaction in
do { do {

Loading…
Cancel
Save