Merge branch 'charlesmchen/moreBackupFeatureFlag'

7 years ago · 222e07c5bd
parent f68c410bcf 15653498b7
commit 222e07c5bd
2 changed files with 7 additions and 7 deletions
--- a/Signal/src/util/Backup/OWSBackup.h
+++ b/Signal/src/util/Backup/OWSBackup.h
@ -79,8 +79,6 @@ NSError *OWSBackupErrorWithDescription(NSString *description);

 - (AnyPromise *)ensureCloudKitAccess;

- (AnyPromise *)checkCanExportBackup;
-
 - (void)checkCanImportBackup:(OWSBackupBoolBlock)success failure:(OWSBackupErrorBlock)failure;

 // TODO: After a successful import, we should enable backup and
--- a/Signal/src/util/Backup/OWSBackup.m
+++ b/Signal/src/util/Backup/OWSBackup.m
@ -433,11 +433,6 @@ NSError *OWSBackupErrorWithDescription(NSString *description)
        }];
 }

- (AnyPromise *)checkCanExportBackup
-{
-    return [self ensureCloudKitAccess];
-}
-
 - (AnyPromise *)ensureCloudKitAccess
 {
    OWSAssertIsOnMainThread();
@ -473,6 +468,13 @@ NSError *OWSBackupErrorWithDescription(NSString *description)

    OWSLogInfo(@"");

+    if (!OWSBackup.isFeatureEnabled) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            success(NO);
+        });
+        return;
+    }
+
    void (^failWithUnexpectedError)(void) = ^{
        dispatch_async(dispatch_get_main_queue(), ^{
            NSError *error =