Merge pull request #26 from Azure-Samples/eli-dev/javaupdates

Update README.md and error handling fix.

Author: olduroja

java/InkRecognition/android-sample-app/README.md

@@ -51,7 +51,7 @@ Android Studio 3.2 on Windows 10/macOS El-capitan
 1. Connect to a virtual device in Android studio
 2. Build and run the project
 3. Write something on the screen of the virtual device once it is loaded.
-4. After 2 secodns of inactivity, the ink will be recognized and the result will be visible in a toast control.
+4. After 2 seconds of inactivity, the ink will be recognized and the result will be visible in a toast control.
 
 ## Resources
 

java/InkRecognition/android-sample-app/Recognizer/app/src/main/java/CognitiveServices/Ink/Recognition/InkRecognitionDetailsLogger.java

@@ -76,8 +76,10 @@ private static void displayRecognitionUnit(InkRecognitionUnit recognitionUnit) {
 
     private static void displayInkDrawingProperties(InkDrawing drawing) {
 
-        Log.d(TAG, "center: " + drawing.getCenter().x + " " +
-                drawing.getCenter().y);
+        if (drawing.getCenter() != null) {
+            Log.d(TAG, "center: " + drawing.getCenter().x + " " +
+                    drawing.getCenter().y);
+        }
         Log.d(TAG, "rotated angle: "+ drawing.getRotatedAngle());
         Log.d(TAG, "confidence: "+ drawing.getConfidence());
         for (Shape alternate : drawing.getAlternates()) {

java/InkRecognition/android-sample-app/Recognizer/app/src/main/java/CognitiveServices/Ink/Recognition/InkRecognitionError.java

@@ -28,14 +28,20 @@ public class InkRecognitionError {
 
     InkRecognitionError(JSONObject jsonResponse) {
         try {
-            errorCode = jsonResponse.getString("code");
-            message = jsonResponse.getString("message");
-            target = jsonResponse.getString("target");
-            JSONArray jsonDetails = jsonResponse.getJSONArray("details");
-            for (int i = 0;
-                 i < jsonDetails.length();
-                 i++) {
-                 details.add(new InkRecognitionError(jsonDetails.getJSONObject(i)));
+            if (jsonResponse.has("code")) {
+                errorCode = jsonResponse.getString("code");
+                message = jsonResponse.getString("message");
+                target = jsonResponse.getString("target");
+                JSONArray jsonDetails = jsonResponse.getJSONArray("details");
+                for (int i = 0;
+                     i < jsonDetails.length();
+                     i++) {
+                    details.add(new InkRecognitionError(jsonDetails.getJSONObject(i)));
+                }
+            } else {
+                errorCode = "RequestError";
+                message = jsonResponse.getJSONObject("error").getString("message");
+                target = "Request";
             }
         }
         catch (JSONException e) {

java/InkRecognition/android-sample-app/Recognizer/app/src/main/java/CognitiveServices/Ink/Recognition/InkRecognizer.java

@@ -135,17 +135,15 @@ protected InkRecognizer doInBackground(InkRecognizer... params) {
                 if (responseCode == HttpURLConnection.HTTP_OK ||
                     responseCode == HttpURLConnection.HTTP_BAD_REQUEST) {
                     InputStreamReader streamReader = new InputStreamReader(restConnection.getInputStream());
-                    BufferedReader reader = new BufferedReader(streamReader);
-                    StringBuilder stringBuilder = new StringBuilder();
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        stringBuilder.append(line).append("\n");
-                    }
-                    inkRecognizer.buildResult(stringBuilder.toString(), responseCode);
+                    inkRecognizer.buildResult(getResponseString(streamReader), responseCode);
                 }
                 else {
-
-                    inkRecognizer.buildResult("Error Occurred", responseCode);
+                    String responseError = "{}";
+                    if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) {
+                        InputStreamReader streamReader = new InputStreamReader(restConnection.getErrorStream());
+                        responseError = getResponseString(streamReader);
+                    }
+                    inkRecognizer.buildResult(responseError, responseCode);
                 }
             }
             catch (Exception e) {
@@ -155,6 +153,17 @@ protected InkRecognizer doInBackground(InkRecognizer... params) {
             return inkRecognizer;
         }
 
+        private String getResponseString(InputStreamReader streamReader) throws Exception
+        {
+            BufferedReader reader = new BufferedReader(streamReader);
+            StringBuilder responseBody = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                responseBody.append(line).append("\n");
+            }
+            return responseBody.toString();
+        }
+
         @Override
         protected void onPostExecute(InkRecognizer analyzer) {
             StringBuilder recognizedWords = new StringBuilder();

java/InkRecognition/android-sample-app/Recognizer/app/src/main/java/CognitiveServices/Ink/Recognition/InkRoot.java

@@ -111,11 +111,10 @@ public ArrayList<InkWord> getInkWords()
 
     public ArrayList<InkParagraph> getParagraphs()  {
         ArrayList<InkParagraph> paragraphs = new ArrayList<>();
-        Set<Integer> keys = recognizedContainers.keySet();
-        for (Integer key: keys) {
-            //noinspection ConstantConditions
-            if (recognizedContainers.get(key).getCategory() == InkRecognitionUnitCategory.INK_PARAGRAPH) {
-                paragraphs.add((InkParagraph)recognizedContainers.get(key));
+        for (Integer key : recognizedContainers.keySet()) {
+            InkRecognitionUnit entryValue = recognizedContainers.get(key);
+            if (entryValue.getCategory() == InkRecognitionUnitCategory.INK_PARAGRAPH) {
+                paragraphs.add((InkParagraph)entryValue);
             }
         }
         return paragraphs;