oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix 'invalid auth can hang on launch' issue.

Browse source
This commit is contained in:
Matthew Chen 2018-03-26 12:55:17 -04:00
parent 4ca29b06ef
commit ef34cd5d58
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift
View file

@ -21,9 +21,14 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
// Overriding runUp since we have some specific completion criteria which
// is more likely to fail since it involves network requests.
override public func runUp(completion:@escaping ((Void)) -> Void) {
let job = CompleteRegistrationFixerJob(completionHandler: {
Logger.info("\(self.TAG) Completed. Saving.")
self.save()
let job = CompleteRegistrationFixerJob(completionHandler: { (didSucceed) in
if (didSucceed) {
Logger.info("\(self.TAG) Completed. Saving.")
self.save()
} else {
Logger.error("\(self.TAG) Failed. Saving.")
}
completion()
})
@ -46,9 +51,9 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
static let kRetryInterval: TimeInterval = 5 * 60
var timer: Timer?
let completionHandler: () -> Void
let completionHandler: (Bool) -> Void
init(completionHandler: @escaping () -> Void) {
init(completionHandler: @escaping (Bool) -> Void) {
self.completionHandler = completionHandler
}
@ -69,8 +74,21 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
Logger.info("\(strongSelf.TAG) complete. Canceling timer and saving.")
isCompleted = true
aTimer.invalidate()
strongSelf.completionHandler()
strongSelf.completionHandler(true)
}.catch { error in
let nserror = error as NSError
if nserror.domain == TSNetworkManagerDomain {
// Don't retry if we had an unrecoverable error.
// In particular, 401 (invalid auth) is unrecoverable.
let isUnrecoverableError = (400 <= nserror.code) && (nserror.code <= 599)
if isUnrecoverableError {
Logger.error("\(strongSelf.TAG) failed due to unrecoverable error: \(error). Aborting.")
aTimer.invalidate()
strongSelf.completionHandler(false)
return
}
}
Logger.error("\(strongSelf.TAG) failed with \(error). We'll try again in \(CompleteRegistrationFixerJob.kRetryInterval) seconds.")
}.retainUntilComplete()
}

2
SignalServiceKit/src/Util/AppReadiness.m
View file

@ -80,6 +80,8 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssertIsOnMainThread();
OWSAssert(!self.isAppReady);
DDLogInfo(@"%@ %s", self.logTag, __PRETTY_FUNCTION__);
self.isAppReady = YES;
[self runAppReadyBlocks];