support both 1.14 and 1.15 JSON APIs

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / LedgerTransaction.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
index 689d619a694d2d15ae0d5ea6a110aa1e8fcf3b30..696803670c51067b88a3f002d282db95fe19e8c0 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -19,10 +19,7 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
-import net.ktnx.mobileledger.json.ParsedLedgerTransaction;
-import net.ktnx.mobileledger.json.ParsedPosting;
 import net.ktnx.mobileledger.utils.Digest;
 import net.ktnx.mobileledger.utils.Globals;
 
@@ -57,8 +54,8 @@ public class LedgerTransaction {
             throws ParseException {
         this(id, Globals.parseLedgerDate(dateString), description);
     }
-    public LedgerTransaction(Integer id, Date date, String description) {
-        this.profile = Data.profile.get().getUuid();
+    public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) {
+        this.profile = profile.getUuid();
         this.id = id;
         this.date = date;
         this.description = description;
@@ -66,6 +63,9 @@ public class LedgerTransaction {
         this.dataHash = null;
         dataLoaded = false;
     }
+    public LedgerTransaction(Integer id, Date date, String description) {
+        this(id, date, description, Data.profile.getValue());
+    }
     public LedgerTransaction(Date date, String description) {
         this(null, date, description);
     }
@@ -138,8 +138,8 @@ public class LedgerTransaction {
                 .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
         {
             boolean result = c.moveToFirst();
-            Log.d("db", String.format("Transaction %d (%s) %s", id, dataHash,
-                    result ? "already present" : "not present"));
+//            debug("db", String.format("Transaction %d (%s) %s", id, dataHash,
+//                    result ? "already present" : "not present"));
             return result;
         }
     }
@@ -169,7 +169,7 @@ public class LedgerTransaction {
                         new String[]{profile, String.valueOf(id)}))
                 {
                     while (cAcc.moveToNext()) {
-//                        Log.d("transactions",
+//                        debug("transactions",
 //                                String.format("Loaded %d: %s %1.2f %s", id, cAcc.getString(0),
 //                                        cAcc.getFloat(1), cAcc.getString(2)));
                         addAccount(new LedgerTransactionAccount(cAcc.getString(0), cAcc.getFloat(1),
@@ -188,21 +188,4 @@ public class LedgerTransaction {
     public void finishLoading() {
         dataLoaded = true;
     }
-    public ParsedLedgerTransaction toParsedLedgerTransaction() {
-        ParsedLedgerTransaction result = new ParsedLedgerTransaction();
-        result.setTcomment("");
-        result.setTprecedingcomment("");
-
-        ArrayList<ParsedPosting> postings = new ArrayList<>();
-        for (LedgerTransactionAccount acc : accounts) {
-            if (!acc.getAccountName().isEmpty()) postings.add(acc.asParsedPosting());
-        }
-
-        result.setTpostings(postings);
-        result.setTdate(Globals.formatIsoDate(date));
-        result.setTdate2(null);
-        result.setTindex(1);
-        result.setTdescription(description);
-        return result;
-    }
 }