Fix representation of AmountPrecision for v1.23

In v1.23+, AmountPrecision is serialized and deserialized as though
it's a Maybe Word8; it's expected to be either an integer or null, not
a JSON object.

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPosting.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPosting.java
index 8f0cdbcdfe17e22227e05348f11c14e8e8f3ef5a..e60bd193c3989a2f44042b9a412c0d072608a952 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPosting.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPosting.java
@@ -59,7 +59,7 @@ public class ParsedPosting extends net.ktnx.mobileledger.json.ParsedPosting {
         ParsedStyle style = new ParsedStyle();
         style.setAscommodityside(getCommoditySide());
         style.setAscommodityspaced(getCommoditySpaced());
-        style.setAsprecision(new ParsedPrecision(2));
+        style.setAsprecision(2);
         style.setAsdecimalpoint('.');
         amt.setAstyle(style);
         if (acc.getCurrency() != null)

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPrecision.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPrecision.java
deleted file mode 100644 (file)
index ffaac7d..0000000
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedPrecision.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright © 2020 Damyan Ivanov.
- * This file is part of MoLe.
- * MoLe is free software: you can distribute it and/or modify it
- * under the term of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your opinion), any later version.
- *
- * MoLe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License terms for details.
- *
- * You should have received a copy of the GNU General Public License
- * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package net.ktnx.mobileledger.json.v1_23;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-class ParsedPrecision {
-    private int contents;
-    private String tag;
-    ParsedPrecision() {
-        tag = "NaturalPrecision";
-    }
-    ParsedPrecision(int contents) {
-        this.contents = contents;
-        tag = "Precision";
-    }
-    public int getContents() {
-        return contents;
-    }
-    public void setContents(int contents) {
-        this.contents = contents;
-    }
-    public String getTag() {
-        return tag;
-    }
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-}

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedStyle.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedStyle.java
index c9bf8bef70dbbb89761acef2a1b0bef52e4facd5..d3a0a133bb49b24ecbb856fd82965048deeb3060 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedStyle.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_23/ParsedStyle.java
@@ -21,13 +21,13 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ParsedStyle extends net.ktnx.mobileledger.json.ParsedStyle {
-    private ParsedPrecision asprecision;
+    private int asprecision;
     public ParsedStyle() {
     }
-    public ParsedPrecision getAsprecision() {
+    public int getAsprecision() {
         return asprecision;
     }
-    public void setAsprecision(ParsedPrecision asprecision) {
+    public void setAsprecision(int asprecision) {
         this.asprecision = asprecision;
     }
 }