From d189621495f75c959849c7dbeea1cfbe5c4b8a50 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Tue, 2 Apr 2019 17:09:00 -0400 Subject: [PATCH 1/2] Don't bother cleaning up CKOperations per feature flag. --- Signal/src/util/Backup/OWSBackup.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index 6e0e7aeb3..5fabacf62 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "OWSBackup.h" @@ -138,7 +138,9 @@ NSError *OWSBackupErrorWithDescription(NSString *description) - (void)setup { - [OWSBackupAPI setup]; + if (OWSBackup.isFeatureEnabled) { + [OWSBackupAPI setup]; + } [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) From dc46974395b16d8c1488e617fe6c4d923d131161 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 3 Apr 2019 13:11:08 -0400 Subject: [PATCH 2/2] Respond to CR. --- Signal/src/util/Backup/OWSBackup.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Signal/src/util/Backup/OWSBackup.m b/Signal/src/util/Backup/OWSBackup.m index 5fabacf62..c56069ded 100644 --- a/Signal/src/util/Backup/OWSBackup.m +++ b/Signal/src/util/Backup/OWSBackup.m @@ -138,10 +138,12 @@ NSError *OWSBackupErrorWithDescription(NSString *description) - (void)setup { - if (OWSBackup.isFeatureEnabled) { - [OWSBackupAPI setup]; + if (!OWSBackup.isFeatureEnabled) { + return; } + [OWSBackupAPI setup]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:) name:OWSApplicationDidBecomeActiveNotification