Merge branch 'charlesmchen/cleanCKOperationsVsFeatureFlag' into release/2.38.1

6 years ago · 9bf7e8fb87
parent 9c9545b408 dc46974395
commit 9bf7e8fb87
1 changed files with 5 additions and 1 deletions
--- 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,6 +138,10 @@ NSError *OWSBackupErrorWithDescription(NSString *description)

 - (void)setup
 {
+    if (!OWSBackup.isFeatureEnabled) {
+        return;
+    }
+
    [OWSBackupAPI setup];

    [[NSNotificationCenter defaultCenter] addObserver:self