Fix SDLFile equality checkbugfix/issue-2034-file-manager-multiple-uploads

2 files changed, 11 insertions, 3 deletions

diff --git a/SmartDeviceLink/public/SDLFile.m b/SmartDeviceLink/public/SDLFile.m
index 89b8042b4..424e7c3b3 100644
--- a/SmartDeviceLink/public/SDLFile.m
+++ b/SmartDeviceLink/public/SDLFile.m
@@ -168,7 +168,7 @@ NS_ASSUME_NONNULL_BEGIN
     fileCopy.persistent = _persistent;
     fileCopy.isStaticIcon = _isStaticIcon;
 
-    if (_data.length == 0 && _fileURL != nil) {
+    if (_data.length != 0) {
         fileCopy.data = _data.copy;
     }
 
@@ -197,9 +197,17 @@ NS_ASSUME_NONNULL_BEGIN
     if (!file) { return NO; }
 
     BOOL haveEqualNames = [self.name isEqualToString:file.name];
-    BOOL haveEqualData = [self.data isEqualToData:file.data];
     BOOL haveEqualFormats = [self.fileType isEqualToEnum:file.fileType];
 
+    BOOL haveEqualData = NO;
+    if (self.data.length == 0 && file.data.length == 0) {
+        haveEqualData = [self.fileURL isEqual:file.fileURL];
+    } else if (self.data.length > 0 && file.data.length > 0) {
+        haveEqualData = [self.data isEqualToData:file.data];
+    } else {
+        return NO;
+    }
+
     return haveEqualNames && haveEqualData && haveEqualFormats;
 }
 
diff --git a/SmartDeviceLink/public/SDLFileManager.m b/SmartDeviceLink/public/SDLFileManager.m
index 38d63ec2c..dfac0361d 100644
--- a/SmartDeviceLink/public/SDLFileManager.m
+++ b/SmartDeviceLink/public/SDLFileManager.m
@@ -333,7 +333,7 @@ SDLFileManagerState *const SDLFileManagerStateStartupError = @"StartupError";
         dispatch_group_enter(uploadFilesTask);
         __weak typeof(self) weakself = self;
         [self uploadFile:file completionHandler:^(BOOL success, NSUInteger bytesAvailable, NSError * _Nullable error) {
-            if(!success) {
+            if (!success) {
                 failedUploads[file.name] = error;
             }