diff options
| author | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-19 11:08:50 -0800 |
|---|---|---|
| committer | Muller, Alexander (A.) <amulle19@ford.com> | 2017-01-19 11:08:50 -0800 |
| commit | 3429c38d8f0e76028f59b6d49a2a46eb68270fea (patch) | |
| tree | 3789e08a1007a41db8d7fdfbd72493c6afe394ff /SmartDeviceLink/SDLUploadFileOperation.m | |
| parent | aef328f494aea84367af8d0d800253dfe38044b1 (diff) | |
| parent | 39d3b1bd1eddaad338aa93556a5846daa31e6960 (diff) | |
| download | sdl_ios-3429c38d8f0e76028f59b6d49a2a46eb68270fea.tar.gz | |
Merge remote-tracking branch 'origin/master' into develop
* origin/master:
Fixed issue around not calculating an SDLPutFile's currentOffset correctly. Updated unit tests to cover all SDLPutFiles, not just the first.
# Conflicts:
# SmartDeviceLinkTests/DevAPISpecs/SDLUploadFileOperationSpec.m
Diffstat (limited to 'SmartDeviceLink/SDLUploadFileOperation.m')
| -rw-r--r-- | SmartDeviceLink/SDLUploadFileOperation.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SmartDeviceLink/SDLUploadFileOperation.m b/SmartDeviceLink/SDLUploadFileOperation.m index aaba69fc0..b1648bd4c 100644 --- a/SmartDeviceLink/SDLUploadFileOperation.m +++ b/SmartDeviceLink/SDLUploadFileOperation.m @@ -146,7 +146,7 @@ NS_ASSUME_NONNULL_BEGIN currentOffset = mtuSize; } else { putFile.bulkData = [fileData subdataWithRange:NSMakeRange(currentOffset, [putFile.length unsignedIntegerValue])]; - currentOffset = [putFile.length unsignedIntegerValue]; + currentOffset += [putFile.length unsignedIntegerValue]; } [putFiles addObject:putFile]; |