X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdb%2FProfile.java;h=030ae1ba51d5215d1d4d5b04b6592317ba64e05c;hp=76d0e0590704f8b161774451b82211655e017f7d;hb=9b4d7761927317f74b68ca22e53b7d60bbabf2e3;hpb=8c92dd30f3703556f7edda057e997283311be873

diff --git a/app/src/main/java/net/ktnx/mobileledger/db/Profile.java b/app/src/main/java/net/ktnx/mobileledger/db/Profile.java
index 76d0e059..030ae1ba 100644
--- a/app/src/main/java/net/ktnx/mobileledger/db/Profile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/Profile.java
@@ -27,12 +27,15 @@ import androidx.room.PrimaryKey;
 import androidx.room.Transaction;
 
 import net.ktnx.mobileledger.dao.AccountDAO;
-import net.ktnx.mobileledger.dao.DescriptionHistoryDAO;
 import net.ktnx.mobileledger.dao.OptionDAO;
 import net.ktnx.mobileledger.dao.TransactionDAO;
+import net.ktnx.mobileledger.utils.Misc;
+
+import org.jetbrains.annotations.NotNull;
 
 @Entity(tableName = "profiles")
 public class Profile {
+    public static final long NO_PROFILE_ID = 0;
     @ColumnInfo
     @PrimaryKey(autoGenerate = true)
     private long id;
@@ -160,11 +163,12 @@ public class Profile {
     public void setShowCommodityByDefault(boolean showCommodityByDefault) {
         this.showCommodityByDefault = showCommodityByDefault;
     }
+    @NotNull
     public String getDefaultCommodity() {
         return defaultCommodity;
     }
-    public void setDefaultCommodity(String defaultCommodity) {
-        this.defaultCommodity = defaultCommodity;
+    public void setDefaultCommodity(@org.jetbrains.annotations.Nullable String defaultCommodity) {
+        this.defaultCommodity = Misc.nullIsEmpty(defaultCommodity);
     }
     public boolean getShowCommentsByDefault() {
         return showCommentsByDefault;
@@ -195,6 +199,26 @@ public class Profile {
     public String toString() {
         return getName();
     }
+    @Override
+    public boolean equals(@Nullable Object o) {
+        if (!(o instanceof Profile))
+            return false;
+        Profile p = (Profile) o;
+        return id == p.id && Misc.equalStrings(name, p.name) &&
+               Misc.equalStrings(deprecatedUUID, p.deprecatedUUID) &&
+               Misc.equalStrings(url, p.url) && useAuthentication == p.useAuthentication &&
+               Misc.equalStrings(authUser, p.authUser) &&
+               Misc.equalStrings(authPassword, p.authPassword) && orderNo == p.orderNo &&
+               permitPosting == p.permitPosting && theme == p.theme &&
+               Misc.equalStrings(preferredAccountsFilter, p.preferredAccountsFilter) &&
+               futureDates == p.futureDates && apiVersion == p.apiVersion &&
+               showCommentsByDefault == p.showCommentsByDefault &&
+               Misc.equalStrings(defaultCommodity, p.defaultCommodity) &&
+               showCommentsByDefault == p.showCommentsByDefault &&
+               detectedVersionPre_1_19 == p.detectedVersionPre_1_19 &&
+               detectedVersionMajor == p.detectedVersionMajor &&
+               detectedVersionMinor == p.detectedVersionMinor;
+    }
     @Transaction
     public void wipeAllDataSync() {
         OptionDAO optDao = DB.get()
@@ -207,11 +231,7 @@ public class Profile {
 
         TransactionDAO trnDao = DB.get()
                                   .getTransactionDAO();
-        trnDao.deleteSync(trnDao.allForProfileSync(id));
-
-        DescriptionHistoryDAO descDao = DB.get()
-                                          .getDescriptionHistoryDAO();
-        descDao.sweepSync();
+        trnDao.deleteSync(trnDao.getAllForProfileUnorderedSync(id));
     }
     public void wipeAllData() {
         AsyncTask.execute(this::wipeAllDataSync);