Correctly restore SessionSettings (#2080)

MozillaReality · Oct 28, 2019 · 55a0b24 · 55a0b24
1 parent dac11c4
commit 55a0b24
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionState.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionState.java
@@ -98,6 +98,9 @@ public void write(JsonWriter out, T value) throws IOException {
                                     }
                                 }
                             }
+                            if (session.mSettings != null) {
+                                out.name("mSettings").jsonValue(gson.toJson(session.mSettings));
+                            }
                             out.endObject();
 
                         } else {
@@ -112,16 +115,7 @@ public void write(JsonWriter out, T value) throws IOException {
                 public T read(JsonReader in) throws IOException {
                     try {
                         return delegate.read(in);
-
-                    } catch (IOException e) {
-                        in.skipValue();
-                        return null;
-
-                    } catch (IllegalStateException e) {
-                        in.skipValue();
-                        return null;
-
-                    } catch (JsonSyntaxException e) {
+                    } catch (Exception e) {
                         in.skipValue();
                         return null;
                     }