diff options
author | NicoleYarroch <nicole@livio.io> | 2019-02-21 14:41:05 -0500 |
---|---|---|
committer | NicoleYarroch <nicole@livio.io> | 2019-02-21 14:41:05 -0500 |
commit | 399a880d1dd739b13c706d5c7482e610bab7b4aa (patch) | |
tree | d6d065ea3b14977e4433fee0dbc108f97fb79f14 | |
parent | 29af71626eabb0bd7bd91038ac8323b0c27e82ec (diff) | |
download | sdl_ios-feature/issue_1147_and_1148_app_services_handle_requests_send_responses.tar.gz |
Fixed no notification when a PASI request receivedfeature/issue_1147_and_1148_app_services_handle_requests_send_responses
Fixed the notification dispatacher not being called when a PerformAppServiceInteraction request is received. Had to fix `onPerformAppServiceInteraction:` name in `ProxyListener`.
5 files changed, 5 insertions, 5 deletions
diff --git a/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.m b/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.m index 5c67e3e8a..44dc938d5 100644 --- a/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.m +++ b/SmartDeviceLink/SDLAsynchronousRPCRequestOperation.m @@ -90,7 +90,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)sdl_sendRequest:(SDLRPCRequest *)request { __weak typeof(self) weakSelf = self; - [self.connectionManager sendConnectionRequest:request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { + [self.connectionManager sendConnectionRequest:(__kindof SDLRPCMessage *)request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { __strong typeof(self) strongSelf = weakSelf; if (strongSelf.isCancelled) { diff --git a/SmartDeviceLink/SDLNotificationDispatcher.m b/SmartDeviceLink/SDLNotificationDispatcher.m index d786d2f14..aff64f93f 100644 --- a/SmartDeviceLink/SDLNotificationDispatcher.m +++ b/SmartDeviceLink/SDLNotificationDispatcher.m @@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN [self postRPCResponseNotification:SDLDidReceiveListFilesResponse response:response]; } -- (void)onPerformAppServiceInteractionRequest:(SDLPerformAppServiceInteraction *)request { +- (void)onPerformAppServiceInteraction:(SDLPerformAppServiceInteraction *)request { [self postRPCRequestNotification:SDLDidReceivePerformAppServiceInteractionRequest request:request]; } diff --git a/SmartDeviceLink/SDLProxyListener.h b/SmartDeviceLink/SDLProxyListener.h index 00e31c072..493f59bd4 100644 --- a/SmartDeviceLink/SDLProxyListener.h +++ b/SmartDeviceLink/SDLProxyListener.h @@ -446,7 +446,7 @@ NS_ASSUME_NONNULL_BEGIN * * @param request A SDLPerformAppServiceInteraction object */ -- (void)onPerformAppServiceInteractionRequest:(SDLPerformAppServiceInteraction *)request; +- (void)onPerformAppServiceInteraction:(SDLPerformAppServiceInteraction *)request; /** * Called when a Perform App Service Interaction Response is received from Core diff --git a/SmartDeviceLink/SDLSequentialRPCRequestOperation.m b/SmartDeviceLink/SDLSequentialRPCRequestOperation.m index 142812d40..35c7638a1 100644 --- a/SmartDeviceLink/SDLSequentialRPCRequestOperation.m +++ b/SmartDeviceLink/SDLSequentialRPCRequestOperation.m @@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN // Send the next request SDLRPCRequest *request = self.requests[self.currentRequestIndex]; - [self.connectionManager sendConnectionRequest:request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { + [self.connectionManager sendConnectionRequest:(__kindof SDLRPCMessage *)request withResponseHandler:^(__kindof SDLRPCRequest * _Nullable request, __kindof SDLRPCResponse * _Nullable response, NSError * _Nullable error) { self.requestsComplete++; // If this request failed and no request has yet failed, set our internal request failed to YES diff --git a/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m b/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m index be3fa4cb1..8464a481d 100644 --- a/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m +++ b/SmartDeviceLinkTests/Notifications/SDLNotificationDispatcherSpec.m @@ -63,7 +63,7 @@ describe(@"a notification dispatcher", ^{ expect(@([testDispatcher respondsToSelector:@selector(onOnTouchEvent:)])).to(beTruthy()); expect(@([testDispatcher respondsToSelector:@selector(onOnVehicleData:)])).to(beTruthy()); expect(@([testDispatcher respondsToSelector:@selector(onOnWayPointChange:)])).to(beTruthy()); - expect(@([testDispatcher respondsToSelector:@selector(onPerformAppServiceInteractionRequest:)])).to(beTruthy()); + expect(@([testDispatcher respondsToSelector:@selector(onPerformAppServiceInteraction:)])).to(beTruthy()); expect(@([testDispatcher respondsToSelector:@selector(onPerformAppServiceInteractionResponse:)])).to(beTruthy()); expect(@([testDispatcher respondsToSelector:@selector(onPerformAudioPassThruResponse:)])).to(beTruthy()); expect(@([testDispatcher respondsToSelector:@selector(onPerformInteractionResponse:)])).to(beTruthy()); |