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=56155cc6480c19bd6635a6785dff6029036b25e9;hb=9b4d7761927317f74b68ca22e53b7d60bbabf2e3;hpb=178110fe9e95cff2c1eb91b257f3caf5e0017d5b 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 56155cc6..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,11 +27,12 @@ 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; @@ -162,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; @@ -230,10 +232,6 @@ public class Profile { TransactionDAO trnDao = DB.get() .getTransactionDAO(); trnDao.deleteSync(trnDao.getAllForProfileUnorderedSync(id)); - - DescriptionHistoryDAO descDao = DB.get() - .getDescriptionHistoryDAO(); - descDao.sweepSync(); } public void wipeAllData() { AsyncTask.execute(this::wipeAllDataSync);