Updating method for checking payload protected to isPayloadProtected instead of getPayloadProtected. Created constants instead of hardcoded ints in SdlProxyBase.

Author: anildahiya

sdl_android_lib/src/com/smartdevicelink/proxy/RPCStruct.java

@@ -74,7 +74,7 @@ public void setPayloadProtected(Boolean bVal) {
 		protectedPayload = bVal;
 	}
 
-	public Boolean getPayloadProtected() {
+	public Boolean isPayloadProtected() {
 		return protectedPayload;
 	}
 

sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java

@@ -102,6 +102,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 	public static final String TAG = "SdlProxy";
 	private static final String SDL_LIB_TRACE_KEY = "42baba60-eb57-11df-98cf-0800200c9a66";
 	private static final int PROX_PROT_VER_ONE = 1;
+	private static final int RESPONSE_WAIT_TIME = 2000;
 
 	private SdlSession sdlSession = null;
 	private proxyListenerType _proxyListener = null;
@@ -1648,7 +1649,7 @@ private void sendRPCRequestPrivate(RPCRequest request) throws SdlException {
 			pm.setMessageType(MessageType.RPC);
 			pm.setSessionType(SessionType.RPC);
 			pm.setFunctionID(FunctionID.getFunctionId(request.getFunctionName()));
-			pm.setPayloadProtected(request.getPayloadProtected());
+			pm.setPayloadProtected(request.isPayloadProtected());
 			if (request.getCorrelationID() == null)
 			{
 				//Log error here
@@ -3441,7 +3442,7 @@ public boolean startH264(InputStream is, boolean isEncrypted) {
 
 		sdlSession.startService(SessionType.NAV, sdlSession.getSessionId(), isEncrypted);
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3474,7 +3475,7 @@ public OutputStream startH264(boolean isEncrypted) {
 		navServiceStartResponse = false;
 		sdlSession.startService(SessionType.NAV, sdlSession.getSessionId(), isEncrypted);
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3505,7 +3506,7 @@ public boolean endH264() {
 		navServiceEndResponse = false;
 		sdlSession.stopVideoStream();
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3572,7 +3573,7 @@ public boolean startPCM(InputStream is, boolean isEncrypted) {
 		pcmServiceStartResponse = false;
 		sdlSession.startService(SessionType.PCM, sdlSession.getSessionId(), isEncrypted);
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3604,7 +3605,7 @@ public OutputStream startPCM(boolean isEncrypted) {
 		pcmServiceStartResponse = false;
 		sdlSession.startService(SessionType.PCM, sdlSession.getSessionId(), isEncrypted);
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3637,7 +3638,7 @@ public boolean endPCM() {
 		pcmServiceEndResponse = false;
 		sdlSession.stopAudioStream();
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 
@@ -3673,7 +3674,7 @@ public Surface createOpenGLInputSurface(int frameRate, int iFrameInterval, int w
         navServiceStartResponse = false;
         sdlSession.startService(SessionType.NAV, sdlSession.getSessionId(), isEncrypted);
 
-        FutureTask<Void> fTask =  createFutureTask(new CallableMethod(2000));
+        FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
         ScheduledExecutorService scheduler = createScheduler();
         scheduler.execute(fTask);
 
@@ -3777,7 +3778,7 @@ public boolean startProtectedRPCService() {
 		rpcProtectedStartResponse = false;
 		sdlSession.startService(SessionType.RPC, sdlSession.getSessionId(), true);
 
-		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(10000));
+		FutureTask<Void> fTask =  createFutureTask(new CallableMethod(RESPONSE_WAIT_TIME));
 		ScheduledExecutorService scheduler = createScheduler();
 		scheduler.execute(fTask);
 

sdl_android_lib/src/com/smartdevicelink/security/SdlSecurityBase.java

@@ -10,13 +10,13 @@
 
 public abstract class SdlSecurityBase {
 
-	private SdlSession session = null;	
-	private String appId = null;
-	private List<String> makeList = null;
-	private boolean isInitSuccess = false;
-	private byte sessionId = 0;
-	private static Service appService = null;
-	private List<SessionType> startServiceList = new ArrayList<SessionType>();	
+	protected SdlSession session = null;	
+	protected String appId = null;
+	protected List<String> makeList = null;
+	protected boolean isInitSuccess = false;
+	protected byte sessionId = 0;
+	protected static Service appService = null;
+	protected List<SessionType> startServiceList = new ArrayList<SessionType>();	
 
     public SdlSecurityBase() {
 	}

sdl_android_lib/src/com/smartdevicelink/streaming/StreamRPCPacketizer.java

@@ -45,7 +45,7 @@ public StreamRPCPacketizer(SdlProxyBase<IProxyListenerBase> proxy, IStreamListen
 		iInitialCorrID = request.getCorrelationID();
         mPauseLock = new Object();
         mPaused = false;
-        isRPCProtected = request.getPayloadProtected();
+        isRPCProtected = request.isPayloadProtected();
 		if (proxy != null)
 		{
 			_proxy = proxy;