From 62cf9b1dd5381972b6652cb1ba9923701c0c2a4b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 30 Nov 2017 10:19:34 -0500 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m | 1 + SignalServiceKit/src/Storage/TSStorageManager.m | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m index d9c5cd15d..d9a166c68 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m @@ -367,6 +367,7 @@ NS_ASSUME_NONNULL_BEGIN if (!CurrentAppContext().isMainAppAndActive) { // Don't schedule run when inactive or not in main app. + OWSFail(@"%@ Disappearing messages job timer fired while main app inactive.", self.logTag); return; } diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m index 79e37e2c3..57ae4d62f 100644 --- a/SignalServiceKit/src/Storage/TSStorageManager.m +++ b/SignalServiceKit/src/Storage/TSStorageManager.m @@ -533,6 +533,9 @@ void setDatabaseInitialized() // This is a last ditch effort to avoid blowing away the user's database. [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 @@ -545,8 +548,6 @@ void setDatabaseInitialized() } // Try to reset app by deleting database. - // FIXME SHARINGEXTENSION - OWSFail(@"disabled while Share extension is WIP"); [self resetSignalStorage]; dbPassword = [self createAndSetNewDatabasePassword];