Respond to CR.

pull/1/head
Matthew Chen 8 years ago
parent d17ccadea2
commit 62cf9b1dd5

@ -367,6 +367,7 @@ NS_ASSUME_NONNULL_BEGIN
if (!CurrentAppContext().isMainAppAndActive) { if (!CurrentAppContext().isMainAppAndActive) {
// Don't schedule run when inactive or not in main app. // Don't schedule run when inactive or not in main app.
OWSFail(@"%@ Disappearing messages job timer fired while main app inactive.", self.logTag);
return; return;
} }

@ -533,6 +533,9 @@ void setDatabaseInitialized()
// This is a last ditch effort to avoid blowing away the user's database. // This is a last ditch effort to avoid blowing away the user's database.
[self backgroundedAppDatabasePasswordInaccessibleWithErrorDescription:errorDescription]; [self backgroundedAppDatabasePasswordInaccessibleWithErrorDescription:errorDescription];
} }
} else {
[self backgroundedAppDatabasePasswordInaccessibleWithErrorDescription:
@"Password inaccessible; not main app."];
} }
// At this point, either this is a new install so there's no existing password to retrieve // At this point, either this is a new install so there's no existing password to retrieve
@ -545,8 +548,6 @@ void setDatabaseInitialized()
} }
// Try to reset app by deleting database. // Try to reset app by deleting database.
// FIXME SHARINGEXTENSION
OWSFail(@"disabled while Share extension is WIP");
[self resetSignalStorage]; [self resetSignalStorage];
dbPassword = [self createAndSetNewDatabasePassword]; dbPassword = [self createAndSetNewDatabasePassword];

Loading…
Cancel
Save