diff options
| author | NicoleYarroch <nicole@livio.io> | 2017-10-23 10:15:10 -0400 |
|---|---|---|
| committer | NicoleYarroch <nicole@livio.io> | 2017-10-23 10:15:10 -0400 |
| commit | ef63547847d24d421915e734ec12c59abaf26ae5 (patch) | |
| tree | 1be24362b35a85f4390271e0321b80ecc1b6a1bb | |
| parent | 09b2bb2fdde3e6cdcf1d97fe72dab4444526a554 (diff) | |
| parent | 1d3f0ab16ab6dc0e315226f6203cf8facd2e7b42 (diff) | |
| download | sdl_ios-ef63547847d24d421915e734ec12c59abaf26ae5.tar.gz | |
Merge branch 'release/5.0.0' into example_app/expanded_example_app_5.0.0
| -rw-r--r-- | SmartDeviceLink/SDLIAPTransport.m | 4 | ||||
| -rw-r--r-- | SmartDeviceLink/SDLLogMacros.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/SmartDeviceLink/SDLIAPTransport.m b/SmartDeviceLink/SDLIAPTransport.m index a0474f32e..aec2ba7b4 100644 --- a/SmartDeviceLink/SDLIAPTransport.m +++ b/SmartDeviceLink/SDLIAPTransport.m @@ -7,11 +7,11 @@ #import "EAAccessory+SDLProtocols.h" #import "EAAccessoryManager+SDLProtocols.h" -#import "SDLLogMacros.h" #import "SDLGlobals.h" #import "SDLIAPSession.h" #import "SDLIAPTransport.h" #import "SDLIAPTransport.h" +#import "SDLLogMacros.h" #import "SDLStreamDelegate.h" #import "SDLTimer.h" #import <CommonCrypto/CommonDigest.h> @@ -531,7 +531,7 @@ int const ProtocolIndexTimeoutSeconds = 20; NSInteger bytesRead = [istream read:buf maxLength:[[SDLGlobals sharedGlobals] mtuSizeForServiceType:SDLServiceTypeRPC]]; NSData *dataIn = [NSData dataWithBytes:buf length:bytesRead]; SDLLogBytes(dataIn, SDLLogBytesDirectionReceive); - + if (bytesRead > 0) { [strongSelf.delegate onDataReceived:dataIn]; } else { diff --git a/SmartDeviceLink/SDLLogMacros.h b/SmartDeviceLink/SDLLogMacros.h index 691210b19..f51386e10 100644 --- a/SmartDeviceLink/SDLLogMacros.h +++ b/SmartDeviceLink/SDLLogMacros.h @@ -27,6 +27,7 @@ #else +#define SDLLogBytes(bytes, transmissionDirection) #define SDLLogV(msg, ...) #define SDLLogD(msg, ...) |