From a753ca0562e2a241de00302c69eda630f296893f Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Tue, 8 Mar 2016 23:30:31 +0100
Subject: [PATCH] Save valid property in JSON

---
 .../org/solovyev/android/calculator/DisplayState.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/solovyev/android/calculator/DisplayState.java b/app/src/main/java/org/solovyev/android/calculator/DisplayState.java
index 213dfe39..92c2d994 100644
--- a/app/src/main/java/org/solovyev/android/calculator/DisplayState.java
+++ b/app/src/main/java/org/solovyev/android/calculator/DisplayState.java
@@ -26,7 +26,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
 import android.view.ContextMenu;
-
+import jscl.math.Generic;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.solovyev.android.calculator.jscl.JsclOperation;
@@ -34,8 +34,6 @@ import org.solovyev.android.calculator.jscl.JsclOperation;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import jscl.math.Generic;
-
 public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
 
     public static final Creator<DisplayState> CREATOR = new Creator<DisplayState>() {
@@ -50,6 +48,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
         }
     };
     private static final String JSON_TEXT = "t";
+    private static final String JSON_VALID = "v";
     @Nonnull
     public final String text;
     public final boolean valid;
@@ -66,7 +65,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
     }
 
     DisplayState(@Nonnull JSONObject json) {
-        this(json.optString(JSON_TEXT), true, Calculator.NO_SEQUENCE);
+        this(json.optString(JSON_TEXT), json.optBoolean(JSON_VALID, true), Calculator.NO_SEQUENCE);
     }
 
     private DisplayState(Parcel in) {
@@ -123,6 +122,7 @@ public class DisplayState implements Parcelable, ContextMenu.ContextMenuInfo {
     public JSONObject toJson() throws JSONException {
         final JSONObject json = new JSONObject();
         json.put(JSON_TEXT, text);
+        json.put(JSON_VALID, valid);
         return json;
     }