Correcting url sending request for HTTP

2 files changed, 31 insertions, 19 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
index 912ba2397..7aa2f0293 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -869,17 +869,27 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 			String sBodyString = msg.getBody();			

 			

 			JSONObject jsonObjectToSendToServer;

-			String valid_json;

-			

+			String valid_json = "";

+			int length;

 			if (sBodyString == null)

-			{				

-				List<String> legacyData = msg.getLegacyData();

-				JSONArray jsonArrayOfSdlPPackets = new JSONArray(legacyData);

-				jsonObjectToSendToServer = new JSONObject();

-				jsonObjectToSendToServer.put("data", jsonArrayOfSdlPPackets);

-				bLegacy = true;

-				updateBroadcastIntent(sendIntent, "COMMENT6", "\r\nLegacy SystemRequest: true");

-				valid_json = jsonObjectToSendToServer.toString().replace("\\", "");

+			{		

+				if(RequestType.HTTP.equals(msg.getRequestType())){

+					length = msg.getBulkData().length;

+					Intent sendIntent3 = createBroadcastIntent();

+					updateBroadcastIntent(sendIntent3, "FUNCTION_NAME", "replace");

+					updateBroadcastIntent(sendIntent3, "COMMENT1", "Valid Json length before replace: " + length);				

+					sendBroadcastIntent(sendIntent3);

+					

+				}else{

+					List<String> legacyData = msg.getLegacyData();

+					JSONArray jsonArrayOfSdlPPackets = new JSONArray(legacyData);

+					jsonObjectToSendToServer = new JSONObject();

+					jsonObjectToSendToServer.put("data", jsonArrayOfSdlPPackets);

+					bLegacy = true;

+					updateBroadcastIntent(sendIntent, "COMMENT6", "\r\nLegacy SystemRequest: true");

+					valid_json = jsonObjectToSendToServer.toString().replace("\\", "");

+					length = valid_json.getBytes("UTF-8").length;

+				}

 			}

  			else

  			{		

@@ -887,14 +897,11 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 				updateBroadcastIntent(sendIntent3, "FUNCTION_NAME", "replace");

 				updateBroadcastIntent(sendIntent3, "COMMENT1", "Valid Json length before replace: " + sBodyString.getBytes("UTF-8").length);				

 				sendBroadcastIntent(sendIntent3);

-				if(RequestType.PROPRIETARY.equals(msg.getRequestType())){

-					valid_json = sBodyString.replace("\\", "");

-				}else{

-					valid_json = sBodyString;

-				}

+				valid_json = sBodyString.replace("\\", "");

+				length = valid_json.getBytes("UTF-8").length;

  			}

 			

-			urlConnection = getURLConnection(myHeader, sURLString, iTimeout, valid_json.getBytes("UTF-8").length);

+			urlConnection = getURLConnection(myHeader, sURLString, iTimeout, length);

 			

 			if (urlConnection == null)

 			{

@@ -904,7 +911,12 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 			}

 

 			DataOutputStream wr = new DataOutputStream(urlConnection.getOutputStream());

-			wr.writeBytes(valid_json);

+			if(RequestType.HTTP.equals(msg.getRequestType())){

+				wr.write(msg.getBulkData());

+			}else{

+				wr.writeBytes(valid_json);

+			}

+			

 			wr.flush();

 			wr.close();

 			

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index 1b8d53e9b..50aa6ad02 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
@@ -68,7 +68,7 @@ public class OnSystemRequest extends RPCNotification {
         	}

         }else if(RequestType.HTTP.equals(this.getRequestType())){

         	//Builds the body from the policy snapshot

-        	tempBody = new String(bulkData);

+        	//tempBody = new String(bulkData);

         	

         	tempHeaders = new Headers();

         	tempHeaders.setContentType("application/json");

@@ -80,7 +80,7 @@ public class OnSystemRequest extends RPCNotification {
         	tempHeaders.setReadTimeout(7);

         	tempHeaders.setInstanceFollowRedirects(false);

         	tempHeaders.setCharset("utf-8");

-        	tempHeaders.setContentLength(tempBody.length()); //TODO check if right

+        	tempHeaders.setContentLength(bulkData.length); //TODO check if right

         }

         

         this.body = tempBody;