fix nanohttpd error on Android L

xiaocong · Jul 15, 2014 · dbc38bc · dbc38bc
1 parent d2a5577
commit dbc38bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/local.properties b/local.properties
@@ -7,4 +7,4 @@
 # location of the SDK. This is only used by Ant
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/home/b036/opt/adt-bundle/sdk
+sdk.dir=/opt/android-studio/sdk
diff --git a/nanohttpd b/nanohttpd
diff --git a/src/com/github/uiautomatorstub/AutomatorHttpServer.java b/src/com/github/uiautomatorstub/AutomatorHttpServer.java
@@ -58,7 +58,13 @@ public Response serve(String uri, Method method,
             }
         } else if (router.containsKey(uri)) {
             JsonRpcServer jsonRpcServer = router.get(uri);
-            ByteArrayInputStream is = new ByteArrayInputStream(params.get("NanoHttpd.QUERY_STRING").getBytes());
+            ByteArrayInputStream is = null;
+            if (params.get("NanoHttpd.QUERY_STRING") != null)
+                is = new ByteArrayInputStream(params.get("NanoHttpd.QUERY_STRING").getBytes());
+            else if (files.get("postData") != null)
+                is = new ByteArrayInputStream(files.get("postData").getBytes());
+            else
+                return new Response(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "Invalid http post data!");
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             try {
                 jsonRpcServer.handle(is, os);
+2 −0		.gitignore
+4 −179		README.md
+18 −0		core/build.gradle
+1 −1		core/pom.xml
+62 −42		core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+53 −10		core/src/test/java/fi/iki/elonen/HttpPostRequestTest.java
+2 −1		pom.xml
+3 −3		samples/pom.xml
+4 −4		webserver/markdown-plugin/pom.xml
+2 −1		webserver/markdown-plugin/src/main/java/fi/iki/elonen/MarkdownWebServerPlugin.java
+3 −3		webserver/pom.xml
+53 −17		webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java
+3 −1		webserver/src/main/java/fi/iki/elonen/WebServerPlugin.java
+104 −0		websocket/pom.xml
+7 −0		websocket/src/main/java/fi/iki/elonen/IWebSocketFactory.java
+39 −0		websocket/src/main/java/fi/iki/elonen/NanoWebSocketServer.java
+207 −0		websocket/src/main/java/fi/iki/elonen/WebSocket.java
+32 −0		websocket/src/main/java/fi/iki/elonen/WebSocketException.java
+430 −0		websocket/src/main/java/fi/iki/elonen/WebSocketFrame.java
+118 −0		websocket/src/main/java/fi/iki/elonen/WebSocketResponseHandler.java
+67 −0		websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocket.java
+22 −0		websocket/src/main/java/fi/iki/elonen/samples/echo/DebugWebSocketServer.java
+22 −0		websocket/src/main/java/fi/iki/elonen/samples/echo/EchoSocketSample.java
+41 −0		websocket/src/test/java/fi/iki/elonen/NanoWebSocketServerTest.java
+120 −0		websocket/src/test/java/fi/iki/elonen/WebSocketResponseHandlerTest.java
+58 −0		websocket/src/test/resources/echo-test.html