make sure data hash is computed before returning it

[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 cdf2068aac46214df78d7fad234467f1b340a140..869d060abf64b6e56d903e026a323e910dc92c5d 100644 (file)
--- 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());
                 }
             };
@@ -123,11 +127,14 @@ public class LedgerTransaction {
         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) {
@@ -140,7 +147,7 @@ public class LedgerTransaction {
                 data.append(item.getComment());
             }
             sha.update(data.toString()
-                           .getBytes(Charset.forName("UTF-8")));
+                           .getBytes(StandardCharsets.UTF_8));
             dataHash = sha.digestToHexString();
         }
         catch (NoSuchAlgorithmException e) {
@@ -164,7 +171,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()) {
@@ -179,6 +186,7 @@ public class LedgerTransaction {
                                     dateString, id));
                 }
                 description = cTr.getString(1);
+                comment = cTr.getString(2);
 
                 try (Cursor cAcc = db.rawQuery(
                         "SELECT account_name, amount, currency, comment FROM " +
@@ -200,6 +208,7 @@ public class LedgerTransaction {
 
     }
     public String getDataHash() {
+        fillDataHash();
         return dataHash;
     }
     public void finishLoading() {