Refactor other sendRPCRequest methods to be more generic with sendRPC

smartdevicelink · Jan 20, 2015 · 5cf4cd0 · 5cf4cd0
1 parent a407a76
commit 5cf4cd0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/sdl_ios/SmartDeviceLink/SDLInterfaceProtocol.h b/sdl_ios/SmartDeviceLink/SDLInterfaceProtocol.h
@@ -17,6 +17,7 @@
 - (void)handleBytesFromTransport:(NSData *)receivedData;
 - (void)sendStartSessionWithType:(SDLServiceType)sessionType;
 - (void)sendEndSessionWithType:(SDLServiceType)sessionType sessionID:(Byte)sessionID;
-- (void)sendRPCRequest:(SDLRPCRequest *)rpcRequest;
+- (void)sendRPC:(SDLRPCMessage *)message;
+- (void)sendRPCRequest:(SDLRPCRequest *)rpcRequest __deprecated_msg("use sendRPC: instead");
 
 @end
diff --git a/sdl_ios/SmartDeviceLink/SDLProxy.h b/sdl_ios/SmartDeviceLink/SDLProxy.h
@@ -29,7 +29,9 @@
 -(void) dispose;
 -(void) addDelegate:(NSObject<SDLProxyListener>*) delegate;
 
--(void) sendRPCRequest:(SDLRPCMessage*) msg;
+-(void) sendRPCRequest:(SDLRPCMessage*) msg __deprecated_msg("use sendRPC: instead");
+-(void) sendRPC:(SDLRPCMessage *)message;
+
 -(void) handleRpcMessage:(NSDictionary*) msg;
 
 -(NSString*) getProxyVersion;

diff --git a/sdl_ios/SmartDeviceLink/SDLProxy.m b/sdl_ios/SmartDeviceLink/SDLProxy.m
@@ -209,6 +209,15 @@ - (void) onProtocolMessageReceived:(SDLProtocolMessage*) msgData {
 
 
 #pragma mark - Message sending and recieving
+- (void)sendRPC:(SDLRPCMessage *)message {
+    @try {
+        [self.protocol sendRPC:message];
+    } @catch (NSException *exception) {
+        NSString *logMessage = [NSString stringWithFormat:@"Proxy: Failed to send RPC message: %@", message.name];
+        [SDLDebugTool logInfo:logMessage withType:SDLDebugType_Debug toOutput:SDLDebugOutput_All toGroup:self.debugConsoleGroupName];
+    }
+}
+
 -(void) sendRPCRequest:(SDLRPCMessage*) msg {
     if ([msg isKindOfClass:SDLRPCRequest.class]) {
         [self sendRPCRequestPrivate:(SDLRPCRequest *)msg];