X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=2f23eff0a082a5d4c8866e498f99f348cf599337;hp=8e16408ff18c69abc73d693fa18734b642c18194;hb=b04c98250e8e2abcf1d652e2a20cff0f9b98784b;hpb=c0a2a2d5aa42ad56f76dfe73ba10250e11e7f3fd

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 8e16408f..2f23eff0 100644
--- 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;
 
@@ -39,10 +36,14 @@ public class LedgerTransaction {
             new Comparator<LedgerTransactionAccount>() {
                 @Override
                 public int compare(LedgerTransactionAccount o1, LedgerTransactionAccount o2) {
-                    int res = o1.getAccountName().compareTo(o2.getAccountName());
-                    if (res != 0) return res;
-                    res = o1.getCurrency().compareTo(o2.getCurrency());
-                    if (res != 0) return res;
+                    int res = o1.getAccountName()
+                                .compareTo(o2.getAccountName());
+                    if (res != 0)
+                        return res;
+                    res = o1.getCurrency()
+                            .compareTo(o2.getCurrency());
+                    if (res != 0)
+                        return res;
                     return Float.compare(o1.getAmount(), o2.getAmount());
                 }
             };
@@ -57,7 +58,8 @@ public class LedgerTransaction {
             throws ParseException {
         this(id, Globals.parseLedgerDate(dateString), description);
     }
-    public LedgerTransaction(Integer id, Date date, String description, MobileLedgerProfile profile) {
+    public LedgerTransaction(Integer id, Date date, String description,
+                             MobileLedgerProfile profile) {
         this.profile = profile.getUuid();
         this.id = id;
         this.date = date;
@@ -67,7 +69,7 @@ public class LedgerTransaction {
         dataLoaded = false;
     }
     public LedgerTransaction(Integer id, Date date, String description) {
-        this(id, date, description, Data.profile.get());
+        this(id, date, description, Data.profile.getValue());
     }
     public LedgerTransaction(Date date, String description) {
         this(null, date, description);
@@ -109,7 +111,8 @@ public class LedgerTransaction {
         return id;
     }
     protected void fillDataHash() {
-        if (dataHash != null) return;
+        if (dataHash != null)
+            return;
         try {
             Digest sha = new Digest(DIGEST_TYPE);
             StringBuilder data = new StringBuilder();
@@ -127,7 +130,8 @@ public class LedgerTransaction {
                 data.append('\0');
                 data.append(item.getAmount());
             }
-            sha.update(data.toString().getBytes(Charset.forName("UTF-8")));
+            sha.update(data.toString()
+                           .getBytes(Charset.forName("UTF-8")));
             dataHash = sha.digestToHexString();
         }
         catch (NoSuchAlgorithmException e) {
@@ -137,21 +141,22 @@ public class LedgerTransaction {
     }
     public boolean existsInDb(SQLiteDatabase db) {
         fillDataHash();
-        try (Cursor c = db
-                .rawQuery("SELECT 1 from transactions where data_hash = ?", new String[]{dataHash}))
+        try (Cursor c = db.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;
         }
     }
     public void loadData(SQLiteDatabase db) {
-        if (dataLoaded) return;
+        if (dataLoaded)
+            return;
 
-        try (Cursor cTr = db
-                .rawQuery("SELECT date, description from transactions WHERE profile=? AND id=?",
-                        new String[]{profile, String.valueOf(id)}))
+        try (Cursor cTr = db.rawQuery(
+                "SELECT date, description from transactions WHERE profile=? AND id=?",
+                new String[]{profile, String.valueOf(id)}))
         {
             if (cTr.moveToFirst()) {
                 String dateString = cTr.getString(0);
@@ -172,7 +177,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),
@@ -191,21 +196,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;
-    }
 }