X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=096d248f4ccf3ae1926179d4fee397f3811889de;hb=d385bacc411bc15cfd8fcaa1a3419b3cb24235d1;hp=2f23eff0a082a5d4c8866e498f99f348cf599337;hpb=b04c98250e8e2abcf1d652e2a20cff0f9b98784b;p=mobile-ledger.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 2f23eff0..096d248f 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;
@@ -44,6 +44,10 @@ public class LedgerTransaction {
                             .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());
                 }
             };
@@ -51,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;
@@ -107,6 +112,12 @@ 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;
     }
@@ -121,6 +132,8 @@ public class LedgerTransaction {
             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) {
@@ -129,9 +142,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")));
+                           .getBytes(StandardCharsets.UTF_8));
             dataHash = sha.digestToHexString();
         }
         catch (NoSuchAlgorithmException e) {
@@ -155,7 +170,7 @@ public class LedgerTransaction {
             return;
 
         try (Cursor cTr = db.rawQuery(
-                "SELECT date, description from transactions WHERE profile=? AND id=?",
+                "SELECT date, description, comment from transactions WHERE profile=? AND id=?",
                 new String[]{profile, String.valueOf(id)}))
         {
             if (cTr.moveToFirst()) {
@@ -166,14 +181,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()) {
@@ -181,7 +197,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();