Merge pull request #293 from smartdevicelink/hotfix/handle_http_on_system_requests

Handle http on system requests

2 files changed, 135 insertions, 85 deletions

diff --git a/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android_lib/src/com/smartdevicelink/proxy/SdlProxyBase.java
index cd320f117..02aa07ae5 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,10 +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);

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

+				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)

 			{

@@ -900,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();

 			

@@ -926,68 +942,89 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 			InputStream is = urlConnection.getInputStream();

 			BufferedReader rd = new BufferedReader(new InputStreamReader(is));

 		    String line;

-		    StringBuffer response = new StringBuffer(); 

+		    StringBuilder response = new StringBuilder(); 

 		    while((line = rd.readLine()) != null) 

 		    {

 		        response.append(line);

 		        response.append('\r');

 			}

 		    rd.close();

-

-			Vector<String> cloudDataReceived = new Vector<String>();			

-				

-			// Convert the response to JSON

-			JSONObject jsonResponse = new JSONObject(response.toString());				

-			if (jsonResponse.get("data") instanceof JSONArray) 

-			{

-				JSONArray jsonArray = jsonResponse.getJSONArray("data");

-				for (int i=0; i<jsonArray.length(); i++) 

-				{

-					if (jsonArray.get(i) instanceof String) 

-					{

-						cloudDataReceived.add(jsonArray.getString(i));

-						//Log.i("sendOnSystemRequestToUrl", "jsonArray.getString(i): " + jsonArray.getString(i));

-					}

-				}

-			} 

-			else if (jsonResponse.get("data") instanceof String) 

-			{

-				cloudDataReceived.add(jsonResponse.getString("data"));

-				//Log.i("sendOnSystemRequestToUrl", "jsonResponse.getString(data): " + jsonResponse.getString("data"));

-			} 

-			else 

-			{

-				DebugTool.logError("sendOnSystemRequestToUrl: Data in JSON Object neither an array nor a string.");

-				//Log.i("sendOnSystemRequestToUrl", "sendOnSystemRequestToUrl: Data in JSON Object neither an array nor a string.");

-				return;

-			}

-				

-			String sResponse = cloudDataReceived.toString();

-				

-			if (sResponse.length() > 512)

-			{

-				sResponse = sResponse.substring(0, 511);

-			}

-								

-			updateBroadcastIntent(sendIntent, "DATA", "Data from cloud response: " + sResponse);

-				

-			// Send new SystemRequest to SDL

-			SystemRequest mySystemRequest;

-			

-			if (bLegacy)

-				mySystemRequest = RPCRequestFactory.buildSystemRequestLegacy(cloudDataReceived, getPoliciesReservedCorrelationID());

-			else

-				mySystemRequest = RPCRequestFactory.buildSystemRequest(response.toString(), getPoliciesReservedCorrelationID());

-			   

-			if (getIsConnected()) 

-			{			    	

-				sendRPCRequestPrivate(mySystemRequest);

-				Log.i("sendOnSystemRequestToUrl", "sent to sdl");											

-										

-				updateBroadcastIntent(sendIntent2, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());

-				updateBroadcastIntent(sendIntent2, "TYPE", RPCMessage.KEY_REQUEST);

-				updateBroadcastIntent(sendIntent2, "CORRID", mySystemRequest.getCorrelationID());

-			}

+		    //We've read the body

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

+		    	// Create the SystemRequest RPC to send to module.

+		    	PutFile putFile = new PutFile();

+		    	putFile.setFileType(FileType.JSON);

+		    	putFile.setCorrelationID(POLICIES_CORRELATION_ID);

+		    	putFile.setSdlFileName("response_data");

+		    	putFile.setFileData(response.toString().getBytes("UTF-8"));

+		    	updateBroadcastIntent(sendIntent, "DATA", "Data from cloud response: " + response.toString());

+		    	

+		    	sendRPCRequestPrivate(putFile);

+		    	Log.i("sendOnSystemRequestToUrl", "sent to sdl");											

+

+	    		updateBroadcastIntent(sendIntent2, "RPC_NAME", FunctionID.PUT_FILE.toString());

+	    		updateBroadcastIntent(sendIntent2, "TYPE", RPCMessage.KEY_REQUEST);

+	    		updateBroadcastIntent(sendIntent2, "CORRID", putFile.getCorrelationID());

+		    	

+		    }else{

+		    	Vector<String> cloudDataReceived = new Vector<String>();			

+		    	final String dataKey = "data";

+		    	// Convert the response to JSON

+		    	JSONObject jsonResponse = new JSONObject(response.toString());				

+		    	if(jsonResponse.has(dataKey)){

+		    		if (jsonResponse.get(dataKey) instanceof JSONArray) 

+		    		{

+		    			JSONArray jsonArray = jsonResponse.getJSONArray(dataKey);

+		    			for (int i=0; i<jsonArray.length(); i++) 

+		    			{

+		    				if (jsonArray.get(i) instanceof String) 

+		    				{

+		    					cloudDataReceived.add(jsonArray.getString(i));

+		    					//Log.i("sendOnSystemRequestToUrl", "jsonArray.getString(i): " + jsonArray.getString(i));

+		    				}

+		    			}

+		    		} 

+		    		else if (jsonResponse.get(dataKey) instanceof String) 

+		    		{

+		    			cloudDataReceived.add(jsonResponse.getString(dataKey));

+		    			//Log.i("sendOnSystemRequestToUrl", "jsonResponse.getString(data): " + jsonResponse.getString("data"));

+		    		} 

+		    	}

+		    	else 

+		    	{

+		    		DebugTool.logError("sendOnSystemRequestToUrl: Data in JSON Object neither an array nor a string.");

+		    		//Log.i("sendOnSystemRequestToUrl", "sendOnSystemRequestToUrl: Data in JSON Object neither an array nor a string.");

+		    		return;

+		    	}

+

+		    	String sResponse = cloudDataReceived.toString();

+

+		    	if (sResponse.length() > 512)

+		    	{

+		    		sResponse = sResponse.substring(0, 511);

+		    	}

+

+		    	updateBroadcastIntent(sendIntent, "DATA", "Data from cloud response: " + sResponse);

+

+		    	// Send new SystemRequest to SDL

+		    	SystemRequest mySystemRequest;

+

+		    	if (bLegacy){

+		    		mySystemRequest = RPCRequestFactory.buildSystemRequestLegacy(cloudDataReceived, getPoliciesReservedCorrelationID());

+		    	}else{

+		    		mySystemRequest = RPCRequestFactory.buildSystemRequest(response.toString(), getPoliciesReservedCorrelationID());

+		    	}

+

+		    	if (getIsConnected()) 

+		    	{			    	

+		    		sendRPCRequestPrivate(mySystemRequest);

+		    		Log.i("sendOnSystemRequestToUrl", "sent to sdl");											

+

+		    		updateBroadcastIntent(sendIntent2, "RPC_NAME", FunctionID.SYSTEM_REQUEST.toString());

+		    		updateBroadcastIntent(sendIntent2, "TYPE", RPCMessage.KEY_REQUEST);

+		    		updateBroadcastIntent(sendIntent2, "CORRID", mySystemRequest.getCorrelationID());

+		    	}

+		    }

 		}

 		catch (SdlException e) 

 		{

@@ -2871,10 +2908,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase>
 					

 					final OnSystemRequest msg = new OnSystemRequest(hash);

 					

-					if ( (msg.getUrl() != null) &&

-						 (msg.getRequestType() == RequestType.PROPRIETARY) &&

-						 (msg.getFileType() == FileType.JSON) )

-					{

+					if ((msg.getUrl() != null) &&

+							(((msg.getRequestType() == RequestType.PROPRIETARY) && (msg.getFileType() == FileType.JSON)) 

+									|| ((msg.getRequestType() == RequestType.HTTP) && (msg.getFileType() == FileType.BINARY)))){

 						Thread handleOffboardTransmissionThread = new Thread() {

 							@Override

 							public void run() {

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 fa96cd1cf..a48f32a05 100644
--- a/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
@@ -52,18 +52,32 @@ public class OnSystemRequest extends RPCNotification {
         JSONObject httpJson;

         String tempBody = null;

         Headers tempHeaders = null;

-        

-        try{

-            JSONObject bulkJson = new JSONObject(new String(bulkData));

-            httpJson = bulkJson.getJSONObject("HTTPRequest");

-            tempBody = getBody(httpJson);

-            tempHeaders = getHeaders(httpJson);

-        }catch(JSONException e){

-            Log.e("OnSystemRequest", "HTTPRequest in bulk data was malformed.");

-            e.printStackTrace();

-        }catch(NullPointerException e){

-            Log.e("OnSystemRequest", "Invalid HTTPRequest object in bulk data.");

-            e.printStackTrace();

+        if(RequestType.PROPRIETARY.equals(this.getRequestType())){

+        	try{

+            	JSONObject bulkJson = new JSONObject(new String(bulkData));

+           

+            	httpJson = bulkJson.getJSONObject("HTTPRequest");

+            	tempBody = getBody(httpJson);

+            	tempHeaders = getHeaders(httpJson);

+        	}catch(JSONException e){

+            	Log.e("OnSystemRequest", "HTTPRequest in bulk data was malformed.");

+            	e.printStackTrace();

+        	}catch(NullPointerException e){

+            	Log.e("OnSystemRequest", "Invalid HTTPRequest object in bulk data.");

+            	e.printStackTrace();

+        	}

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

+        	tempHeaders = new Headers();

+        	tempHeaders.setContentType("application/json");

+        	tempHeaders.setConnectTimeout(7);

+        	tempHeaders.setDoOutput(true);

+        	tempHeaders.setDoInput(true);

+        	tempHeaders.setUseCaches(false);

+        	tempHeaders.setRequestMethod("POST");

+        	tempHeaders.setReadTimeout(7);

+        	tempHeaders.setInstanceFollowRedirects(false);

+        	tempHeaders.setCharset("utf-8");

+        	tempHeaders.setContentLength(bulkData.length); 

         }

         

         this.body = tempBody;