Merge branch 'charlesmchen/cleanCKOperationsVsFeatureFlag' into release/2.38.1

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