X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FLedgerTransaction.java;h=6a8234f28dc8d7145f8cd578db2353f8f5f41aad;hb=c27aa72c2c641bcd568692b4a20b125605cfb3b5;hp=9b73d2ce9d1c9d477c77fe70f83bcdb0ee126aeb;hpb=217da55a224e2ae899d0b50604e2e54f882ec04f;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 9b73d2ce..6a8234f2 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/LedgerTransaction.java
@@ -20,6 +20,10 @@ package net.ktnx.mobileledger.model;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.utils.Digest;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.SimpleDate;
@@ -32,25 +36,21 @@ import java.util.Comparator;
 
 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;
@@ -74,7 +74,7 @@ public class LedgerTransaction {
         dataLoaded = false;
     }
     public LedgerTransaction(Integer id, SimpleDate date, String description) {
-        this(id, date, description, Data.profile.getValue());
+        this(id, date, description, Data.getProfile());
     }
     public LedgerTransaction(SimpleDate date, String description) {
         this(null, date, description);
@@ -98,7 +98,15 @@ public class LedgerTransaction {
         accounts.add(item);
         dataHash = null;
     }
+    @Nullable
+    public SimpleDate getDateIfAny() {
+        return date;
+    }
+    @NonNull
     public SimpleDate getDate() {
+        loadData(App.getDatabase());
+        if (date == null)
+            throw new IllegalStateException("Transaction has no date");
         return date;
     }
     public void setDate(SimpleDate date) {
@@ -207,4 +215,27 @@ public class LedgerTransaction {
     public void finishLoading() {
         dataLoaded = true;
     }
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null)
+            return false;
+        if (!obj.getClass()
+                .equals(this.getClass()))
+            return false;
+
+        return ((LedgerTransaction) obj).getDataHash()
+                                        .equals(getDataHash());
+    }
+
+    public boolean hasAccountNamedLike(String name) {
+        name = name.toUpperCase();
+        for (LedgerTransactionAccount acc : accounts) {
+            if (acc.getAccountName()
+                   .toUpperCase()
+                   .contains(name))
+                return true;
+        }
+
+        return false;
+    }
 }