X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=5d5b7d51ed19f14ffe1ca9e464ff7ee7050b355b;hb=e0adac791ac4ccc9629c98ab46189b9f8047e41b;hp=696803670c51067b88a3f002d282db95fe19e8c0;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;p=mobile-ledger-staging.git

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 69680367..5d5b7d51 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -23,7 +23,7 @@ import android.database.sqlite.SQLiteDatabase;
 import net.ktnx.mobileledger.utils.Digest;
 import net.ktnx.mobileledger.utils.Globals;
 
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -36,10 +36,18 @@ 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;
+                    res = o1.getComment()
+                            .compareTo(o2.getComment());
+                    if (res != 0)
+                        return res;
                     return Float.compare(o1.getAmount(), o2.getAmount());
                 }
             };
@@ -47,6 +55,7 @@ public class LedgerTransaction {
     private Integer id;
     private Date date;
     private String description;
+    private String comment;
     private ArrayList<LedgerTransactionAccount> accounts;
     private String dataHash;
     private boolean dataLoaded;
@@ -54,7 +63,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;
@@ -102,19 +112,29 @@ public class LedgerTransaction {
         this.description = description;
         dataHash = null;
     }
+    public String getComment() {
+        return comment;
+    }
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
     public int getId() {
         return id;
     }
     protected void fillDataHash() {
-        if (dataHash != null) return;
+        if (dataHash != null)
+            return;
         try {
             Digest sha = new Digest(DIGEST_TYPE);
             StringBuilder data = new StringBuilder();
+            data.append("ver1");
             data.append(profile);
             data.append(getId());
             data.append('\0');
             data.append(getDescription());
             data.append('\0');
+            data.append(getComment());
+            data.append('\0');
             data.append(Globals.formatLedgerDate(getDate()));
             data.append('\0');
             for (LedgerTransactionAccount item : accounts) {
@@ -123,8 +143,11 @@ public class LedgerTransaction {
                 data.append(item.getCurrency());
                 data.append('\0');
                 data.append(item.getAmount());
+                data.append('\0');
+                data.append(item.getComment());
             }
-            sha.update(data.toString().getBytes(Charset.forName("UTF-8")));
+            sha.update(data.toString()
+                           .getBytes(StandardCharsets.UTF_8));
             dataHash = sha.digestToHexString();
         }
         catch (NoSuchAlgorithmException e) {
@@ -134,8 +157,8 @@ 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();
 //            debug("db", String.format("Transaction %d (%s) %s", id, dataHash,
@@ -144,11 +167,12 @@ public class LedgerTransaction {
         }
     }
     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, comment from transactions WHERE profile=? AND id=?",
+                new String[]{profile, String.valueOf(id)}))
         {
             if (cTr.moveToFirst()) {
                 String dateString = cTr.getString(0);
@@ -158,14 +182,15 @@ public class LedgerTransaction {
                 catch (ParseException e) {
                     e.printStackTrace();
                     throw new RuntimeException(
-                            String.format("Error parsing date '%s' from " + "transacion %d",
+                            String.format("Error parsing date '%s' from " + "transaction %d",
                                     dateString, id));
                 }
                 description = cTr.getString(1);
+                comment = cTr.getString(2);
 
-                try (Cursor cAcc = db.rawQuery("SELECT account_name, amount, currency FROM " +
-                                               "transaction_accounts WHERE " +
-                                               "profile=? AND transaction_id = ?",
+                try (Cursor cAcc = db.rawQuery(
+                        "SELECT account_name, amount, currency, comment FROM " +
+                        "transaction_accounts WHERE profile=? AND transaction_id = ?",
                         new String[]{profile, String.valueOf(id)}))
                 {
                     while (cAcc.moveToNext()) {
@@ -173,7 +198,7 @@ public class LedgerTransaction {
 //                                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),
-                                cAcc.getString(2)));
+                                cAcc.getString(2), cAcc.getString(3)));
                     }
 
                     finishLoading();