From e8ddc041dd5612652e284816670b32c5d0e40b17 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 3 Dec 2018 22:52:50 -0500
Subject: [PATCH] Respond to CR.

---
 Signal/src/util/Backup/OWSBackupImportJob.m       | 15 +++++++--------
 Signal/src/util/Backup/OWSBackupLazyRestore.swift |  9 ---------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Signal/src/util/Backup/OWSBackupImportJob.m b/Signal/src/util/Backup/OWSBackupImportJob.m
index dc412248a..0c192fbf6 100644
--- a/Signal/src/util/Backup/OWSBackupImportJob.m
+++ b/Signal/src/util/Backup/OWSBackupImportJob.m
@@ -237,14 +237,14 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
                                                      progress:@(progress)];
                       })
                       .thenInBackground(^{
-                          return [self downloadFileFromCloud:item ignoreErrors:NO];
+                          return [self downloadFileFromCloud:item];
                       });
     }
 
     return promise;
 }
 
-- (AnyPromise *)downloadFileFromCloud:(OWSBackupFragment *)item ignoreErrors:(BOOL)ignoreErrors
+- (AnyPromise *)downloadFileFromCloud:(OWSBackupFragment *)item
 {
     OWSAssertDebug(item);
 
@@ -280,11 +280,7 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
                 resolve(@(1));
             })
             .catchInBackground(^(NSError *error) {
-                if (ignoreErrors) {
-                    resolve(@(1));
-                } else {
-                    resolve(error);
-                }
+                resolve(error);
             });
     }];
 }
@@ -302,7 +298,10 @@ NSString *const kOWSBackup_ImportDatabaseKeySpec = @"kOWSBackup_ImportDatabaseKe
 
     if (self.manifest.localProfileAvatarItem) {
         promise = promise.thenInBackground(^{
-            return [self downloadFileFromCloud:self.manifest.localProfileAvatarItem ignoreErrors:YES];
+            return
+                [self downloadFileFromCloud:self.manifest.localProfileAvatarItem].catchInBackground(^(NSError *error) {
+                    OWSLogInfo(@"Ignoring error; profiles are optional: %@", error);
+                });
         });
     }
 
diff --git a/Signal/src/util/Backup/OWSBackupLazyRestore.swift b/Signal/src/util/Backup/OWSBackupLazyRestore.swift
index 8313bd2b3..149dfa48f 100644
--- a/Signal/src/util/Backup/OWSBackupLazyRestore.swift
+++ b/Signal/src/util/Backup/OWSBackupLazyRestore.swift
@@ -62,15 +62,6 @@ public class BackupLazyRestore: NSObject {
         runIfNecessary()
     }
 
-    @objc
-    public func clearCompleteAndRunIfNecessary() {
-        AssertIsOnMainThread()
-
-        isComplete = false
-
-        runIfNecessary()
-    }
-
     @objc
     public func runIfNecessary() {
         AssertIsOnMainThread()