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 13:56:52 -04:00
parent ef34cd5d58
commit 9962bf56b1
2 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
Logger.info("\(self.TAG) Completed. Saving.")
self.save()
} else {
Logger.error("\(self.TAG) Failed. Saving.")
Logger.error("\(self.TAG) Failed.")
}
completion()
@ -48,9 +48,8 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
let TAG = "[CompleteRegistrationFixerJob]"
// Duration between retries if update fails.
static let kRetryInterval: TimeInterval = 5 * 60
let kRetryInterval: TimeInterval = 5
var timer: Timer?
let completionHandler: (Bool) -> Void
init(completionHandler: @escaping (Bool) -> Void) {
@ -58,43 +57,30 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
}
func start() {
assert(self.timer == nil)
guard TSAccountManager.isRegistered() else {
self.completionHandler(true)
return
}
let timer = WeakTimer.scheduledTimer(timeInterval: CompleteRegistrationFixerJob.kRetryInterval, target: self, userInfo: nil, repeats: true) { [weak self] aTimer in
guard let strongSelf = self else {
return
}
var isCompleted = false
strongSelf.ensureProfileComplete().then { _ -> Void in
guard isCompleted == false else {
Logger.info("\(strongSelf.TAG) Already saved. Skipping redundant call.")
self.ensureProfileComplete().then { _ -> Void in
Logger.info("\(self.TAG) complete. Canceling timer and saving.")
self.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 = nserror.code == 401
if isUnrecoverableError {
Logger.error("\(self.TAG) failed due to unrecoverable error: \(error). Aborting.")
self.completionHandler(true)
return
}
Logger.info("\(strongSelf.TAG) complete. Canceling timer and saving.")
isCompleted = true
aTimer.invalidate()
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()
}
self.timer = timer
timer.fire()
Logger.error("\(self.TAG) failed with \(error).")
self.completionHandler(false)
}.retainUntilComplete()
}
func ensureProfileComplete() -> Promise<Void> {

7
SignalMessaging/environment/migrations/OWSDatabaseMigration.m
View file

@ -9,6 +9,13 @@ NS_ASSUME_NONNULL_BEGIN
@implementation OWSDatabaseMigration
- (void)saveWithTransaction:(YapDatabaseReadWriteTransaction *)transaction
{
DDLogInfo(@"%@ marking migration as complete.", self.logTag);
[super saveWithTransaction:transaction];
}
- (instancetype)initWithPrimaryStorage:(OWSPrimaryStorage *)primaryStorage
{
self = [super initWithUniqueId:[self.class migrationId]];