trim comments coming from hledger-web

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / json / v1_14 / ParsedPosting.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java
index 21cc6dbff22130980ca02e624d2c01ef0d13efbb..a92900da157b3cb7014866218bb63a922d8451a8 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/ParsedPosting.java
@@ -42,6 +42,12 @@ public class ParsedPosting {
     public static ParsedPosting fromLedgerAccount(LedgerTransactionAccount acc) {
         ParsedPosting result = new ParsedPosting();
         result.setPaccount(acc.getAccountName());
+
+        String comment = acc.getComment();
+        if (comment == null)
+            comment = "";
+        result.setPcomment(comment);
+
         ArrayList<ParsedAmount> amounts = new ArrayList<>();
         ParsedAmount amt = new ParsedAmount();
         amt.setAcommodity((acc.getCurrency() == null) ? "" : acc.getCurrency());
@@ -88,7 +94,7 @@ public class ParsedPosting {
         return pcomment;
     }
     public void setPcomment(String pcomment) {
-        this.pcomment = pcomment;
+        this.pcomment = (pcomment == null) ? null : pcomment.trim();
     }
     public List<List<String>> getPtags() {
         return ptags;
@@ -129,7 +135,8 @@ public class ParsedPosting {
     public LedgerTransactionAccount asLedgerAccount() {
         ParsedAmount amt = pamount.get(0);
         return new LedgerTransactionAccount(paccount, amt.getAquantity()
-                                                         .asFloat(), amt.getAcommodity());
+                                                         .asFloat(), amt.getAcommodity(),
+                getPcomment());
     }
 
 }