Merge f6bb473 into 044a6ad

bugsnag · Apr 11, 2019 · 5575d7f · 5575d7f
2 parents 044a6ad + f6bb473
commit 5575d7f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 35 deletions.
diff --git a/sdk/src/main/java/com/bugsnag/android/Error.java b/sdk/src/main/java/com/bugsnag/android/Error.java
@@ -19,10 +19,10 @@
 public class Error implements JsonStream.Streamable {
 
     @NonNull
-    private Map<String, Object> appData = new HashMap<String, Object>();
+    private Map<String, Object> appData = new HashMap<>();
 
     @NonNull
-    private Map<String, Object> deviceData = new HashMap<String, Object>();
+    private Map<String, Object> deviceData = new HashMap<>();
 
     @NonNull
     private User user = new User();

diff --git a/sdk/src/main/java/com/bugsnag/android/ErrorReader.java b/sdk/src/main/java/com/bugsnag/android/ErrorReader.java
@@ -291,15 +291,19 @@ private static ArrayList<String> readSeverityReason(JsonReader reader) throws IO
         String attributeValue = null;
         while (reader.hasNext()) {
             String name = reader.nextName();
-            if (name.equals("type")) {
-                type = reader.nextString();
-            } else if (name.equals("attributes")) {
-                reader.beginObject();
-                reader.nextName();
-                attributeValue = reader.nextString();
-                reader.endObject();
-            } else {
-                reader.skipValue();
+            switch (name) {
+                case "type":
+                    type = reader.nextString();
+                    break;
+                case "attributes":
+                    reader.beginObject();
+                    reader.nextName();
+                    attributeValue = reader.nextString();
+                    reader.endObject();
+                    break;
+                default:
+                    reader.skipValue();
+                    break;
             }
         }
         reader.endObject();
@@ -325,31 +329,41 @@ private static Session readSession(JsonReader reader) throws IOException {
         reader.beginObject();
         while (reader.hasNext()) {
             String name = reader.nextName();
-            if (name.equals("id")) {
-                id = reader.nextString();
-            } else if (name.equals("startedAt")) {
-                try {
-                    startedAt = DateUtils.fromIso8601(reader.nextString());
-                } catch (Exception ex) {
-                    throw new IOException("Unable to parse session startedAt: ", ex);
-                }
-            } else if (name.equals("events")) {
-                reader.beginObject();
-                while (reader.hasNext()) {
-                    String eventName = reader.nextName();
-                    if (eventName.equals("unhandled")) {
-                        unhandled = reader.nextInt();
-                    } else if (eventName.equals("handled")) {
-                        handled = reader.nextInt();
-                    } else {
-                        reader.skipValue();
+            switch (name) {
+                case "id":
+                    id = reader.nextString();
+                    break;
+                case "startedAt":
+                    try {
+                        startedAt = DateUtils.fromIso8601(reader.nextString());
+                    } catch (Exception ex) {
+                        throw new IOException("Unable to parse session startedAt: ", ex);
                     }
-                }
-                reader.endObject();
-            } else if (name.equals("user")) {
-                user = readUser(reader);
-            } else {
-                reader.skipValue();
+                    break;
+                case "events":
+                    reader.beginObject();
+                    while (reader.hasNext()) {
+                        String eventName = reader.nextName();
+                        switch (eventName) {
+                            case "unhandled":
+                                unhandled = reader.nextInt();
+                                break;
+                            case "handled":
+                                handled = reader.nextInt();
+                                break;
+                            default:
+                                reader.skipValue();
+                                break;
+                        }
+                    }
+                    reader.endObject();
+                    break;
+                case "user":
+                    user = readUser(reader);
+                    break;
+                default:
+                    reader.skipValue();
+                    break;
             }
         }
         reader.endObject();