diff options
| author | Justin Dickow <jjdickow@gmail.com> | 2016-03-03 16:14:57 -0500 |
|---|---|---|
| committer | Justin Dickow <jjdickow@gmail.com> | 2016-03-03 16:14:57 -0500 |
| commit | efbde438b8515e07efc2539c004e9bd16027746f (patch) | |
| tree | 3c62d2ccda2889220241e9b97c6c9f5395091cea | |
| parent | 5907c3160de279293017ea79784f17bf882d0c0b (diff) | |
| download | sdl_ios-efbde438b8515e07efc2539c004e9bd16027746f.tar.gz | |
Updates according to Joel's comments
Also retested against sdl_core + sdl_server
Signed-off-by: Justin Dickow <jjdickow@gmail.com>
| -rw-r--r-- | SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m index 095b63cbb..46e790f89 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLProxy.m @@ -323,7 +323,7 @@ const int POLICIES_CORRELATION_ID = 65535; } else if (requestType == [SDLRequestType LOCK_SCREEN_ICON_URL]) { [self handleSystemRequestLockScreenIconURL:systemRequest]; } else if (requestType == [SDLRequestType HTTP]) { - [self handleSystemRequestHttp:systemRequest]; + [self handleSystemRequestHTTP:systemRequest]; } } @@ -429,8 +429,8 @@ const int POLICIES_CORRELATION_ID = 65535; }]; } -- (void)handleSystemRequestHttp:(SDLOnSystemRequest *)request { - if (nil == request.bulkData) { +- (void)handleSystemRequestHTTP:(SDLOnSystemRequest *)request { + if (request.bulkData.length == 0) { // TODO: not sure how we want to handle http requests that don't have bulk data (maybe as GET?) return; } @@ -452,7 +452,7 @@ const int POLICIES_CORRELATION_ID = 65535; return; } - if (data == nil || data.length == 0) { + if (data.length == 0) { [SDLDebugTool logInfo:@"OnSystemRequest (HTTP response) failure: no data returned" withType:SDLDebugType_RPC toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName]; return; } @@ -463,8 +463,8 @@ const int POLICIES_CORRELATION_ID = 65535; // Create the SystemRequest RPC to send to module. SDLPutFile *putFile = [[SDLPutFile alloc] init]; putFile.fileType = [SDLFileType JSON]; - putFile.correlationID = [NSNumber numberWithInt:POLICIES_CORRELATION_ID]; - putFile.syncFileName = @"pt.json"; + putFile.correlationID = @(POLICIES_CORRELATION_ID); + putFile.syncFileName = @"response_data"; putFile.bulkData = data; // Send and log RPC Request |