X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=d42e5630d0274f26e3525c510a6435d40f1d023e;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=e31d1582c4cfe551b83d0aa6dc32f7654396cc7a;hpb=0ce370cea3c5c980b6eeb14acf965188ae951f51;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 e31d1582..d42e5630 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -33,34 +33,31 @@ import java.security.NoSuchAlgorithmException;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.List;
 
 public class LedgerTransaction {
     private static final String DIGEST_TYPE = "SHA-256";
-    public final Comparator<LedgerTransactionAccount> comparator =
-            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;
-                    res = o1.getComment()
-                            .compareTo(o2.getComment());
-                    if (res != 0)
-                        return res;
-                    return Float.compare(o1.getAmount(), o2.getAmount());
-                }
-            };
+    public final Comparator<LedgerTransactionAccount> comparator = (o1, o2) -> {
+        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());
+    };
     private String profile;
     private Integer id;
     private SimpleDate date;
     private String description;
     private String comment;
-    private ArrayList<LedgerTransactionAccount> accounts;
+    private List<LedgerTransactionAccount> accounts;
     private String dataHash;
     private boolean dataLoaded;
     public LedgerTransaction(Integer id, String dateString, String description)
@@ -95,7 +92,7 @@ public class LedgerTransaction {
         this.dataHash = null;
         this.dataLoaded = false;
     }
-    public ArrayList<LedgerTransactionAccount> getAccounts() {
+    public List<LedgerTransactionAccount> getAccounts() {
         return accounts;
     }
     public void addAccount(LedgerTransactionAccount item) {
@@ -108,7 +105,6 @@ public class LedgerTransaction {
     }
     @NonNull
     public SimpleDate getDate() {
-        loadData(App.getDatabase());
         if (date == null)
             throw new IllegalStateException("Transaction has no date");
         return date;
@@ -134,6 +130,7 @@ public class LedgerTransaction {
         return id;
     }
     protected void fillDataHash() {
+        loadData(App.getDatabase());
         if (dataHash != null)
             return;
         try {
@@ -167,18 +164,7 @@ public class LedgerTransaction {
                     String.format("Unable to get instance of %s digest", DIGEST_TYPE), e);
         }
     }
-    public boolean existsInDb(SQLiteDatabase db) {
-        fillDataHash();
-        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,
-//                    result ? "already present" : "not present"));
-            return result;
-        }
-    }
-    public void loadData(SQLiteDatabase db) {
+    public synchronized void loadData(SQLiteDatabase db) {
         if (dataLoaded)
             return;
 
@@ -242,4 +228,7 @@ public class LedgerTransaction {
 
         return false;
     }
+    public void markDataAsLoaded() {
+        dataLoaded = true;
+    }
 }