X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=fc940e9ad6f8850b33e4ee9dd118dafc746e1ac3;hb=d08ab8235d0fd152c772b2dd5ffa1ca5747f67b1;hp=8c1f1e5a38186861541c47e353b5aed8e0122c64;hpb=2cc22789021f37c51810552a0187ab7d7f2c2cbd;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java index 8c1f1e5a..fc940e9a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -24,17 +24,19 @@ import android.util.SparseArray; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.async.SendTransactionTask; -import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.Misc; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Locale; @@ -43,9 +45,11 @@ import java.util.UUID; import static net.ktnx.mobileledger.utils.Logger.debug; public final class MobileLedgerProfile { + // N.B. when adding new fields, update the copy-constructor below private String uuid; private String name; private boolean permitPosting; + private boolean showCommentsByDefault; private boolean showCommodityByDefault; private String defaultCommodity; private String preferredAccountsFilter; @@ -55,8 +59,14 @@ public final class MobileLedgerProfile { private String authPassword; private int themeHue; private int orderNo = -1; + // N.B. when adding new fields, update the copy-constructor below private FutureDates futureDates = FutureDates.None; private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto; + private Calendar firstTransactionDate; + private Calendar lastTransactionDate; + private MutableLiveData> accounts = + new MutableLiveData<>(new ArrayList<>()); + private AccountListLoader loader = null; public MobileLedgerProfile() { this.uuid = String.valueOf(UUID.randomUUID()); } @@ -67,6 +77,7 @@ public final class MobileLedgerProfile { uuid = origin.uuid; name = origin.name; permitPosting = origin.permitPosting; + showCommentsByDefault = origin.showCommentsByDefault; showCommodityByDefault = origin.showCommodityByDefault; preferredAccountsFilter = origin.preferredAccountsFilter; url = origin.url; @@ -78,17 +89,20 @@ public final class MobileLedgerProfile { futureDates = origin.futureDates; apiVersion = origin.apiVersion; defaultCommodity = origin.defaultCommodity; + firstTransactionDate = origin.firstTransactionDate; + lastTransactionDate = origin.lastTransactionDate; } // loads all profiles into Data.profiles // returns the profile with the given UUID - public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) { + public static MobileLedgerProfile loadAllFromDB(@Nullable String currentProfileUUID) { MobileLedgerProfile result = null; ArrayList list = new ArrayList<>(); SQLiteDatabase db = App.getDatabase(); try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + "auth_password, permit_posting, theme, order_no, " + "preferred_accounts_filter, future_dates, api_version, " + - "show_commodity_by_default, default_commodity FROM " + + "show_commodity_by_default, default_commodity, " + + "show_comments_by_default FROM " + "profiles order by order_no", null)) { while (cursor.moveToNext()) { @@ -106,6 +120,7 @@ public final class MobileLedgerProfile { item.setApiVersion(cursor.getInt(11)); item.setShowCommodityByDefault(cursor.getInt(12) == 1); item.setDefaultCommodity(cursor.getString(13)); + item.setShowCommentsByDefault(cursor.getInt(14) == 1); list.add(item); if (item.getUuid() .equals(currentProfileUUID)) @@ -132,6 +147,32 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + public LiveData> getAccounts() { + return accounts; + } + synchronized public void scheduleAccountListReload() { + Logger.debug("async-acc", "scheduleAccountListReload() enter"); + if ((loader != null) && loader.isAlive()) { + Logger.debug("async-acc", "returning early - loader already active"); + return; + } + + Logger.debug("async-acc", "Starting AccountListLoader"); + loader = new AccountListLoader(this); + loader.start(); + } + synchronized public void abortAccountListReload() { + if (loader == null) + return; + loader.interrupt(); + loader = null; + } + public boolean getShowCommentsByDefault() { + return showCommentsByDefault; + } + public void setShowCommentsByDefault(boolean newValue) { + this.showCommentsByDefault = newValue; + } public boolean getShowCommodityByDefault() { return showCommodityByDefault; } @@ -239,13 +280,13 @@ public final class MobileLedgerProfile { db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " + "use_authentication, auth_user, auth_password, theme, order_no, " + "preferred_accounts_filter, future_dates, api_version, " + - "show_commodity_by_default, default_commodity) " + - "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "show_commodity_by_default, default_commodity, show_comments_by_default) " + + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{uuid, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, authEnabled ? authPassword : null, themeHue, orderNo, preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(), - showCommodityByDefault, defaultCommodity + showCommodityByDefault, defaultCommodity, showCommentsByDefault }); db.setTransactionSuccessful(); } @@ -256,15 +297,14 @@ public final class MobileLedgerProfile { public void storeAccount(SQLiteDatabase db, LedgerAccount acc) { // replace into is a bad idea because it would reset hidden to its default value // we like the default, but for new accounts only - db.execSQL("update accounts set level = ?, keep = 1, hidden=?, expanded=? " + + db.execSQL("update accounts set level = ?, keep = 1, expanded=? " + "where profile=? and name = ?", - new Object[]{acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded(), uuid, - acc.getName() + new Object[]{acc.getLevel(), acc.isExpanded(), uuid, acc.getName() }); - db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level, hidden, " + - "expanded, keep) " + "select ?,?,?,?,?,?,?,1 where (select changes() = 0)", + db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level, " + + "expanded, keep) " + "select ?,?,?,?,?,?,1 where (select changes() = 0)", new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), - acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded() + acc.getLevel(), acc.isExpanded() }); // debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); } @@ -280,10 +320,11 @@ public final class MobileLedgerProfile { db.execSQL("DELETE from transaction_accounts WHERE profile = ? and transaction_id=?", new Object[]{uuid, tr.getId()}); - db.execSQL("INSERT INTO transactions(profile, id, date, description, data_hash, keep) " + - "values(?,?,?,?,?,1)", - new Object[]{uuid, tr.getId(), Globals.formatLedgerDate(tr.getDate()), - tr.getDescription(), tr.getDataHash() + db.execSQL("INSERT INTO transactions(profile, id, year, month, day, description, " + + "comment, data_hash, keep) values(?,?,?,?,?,?,?,?,1)", + new Object[]{uuid, tr.getId(), tr.getDate().year, tr.getDate().month, + tr.getDate().day, tr.getDescription(), tr.getComment(), + tr.getDataHash() }); for (LedgerTransactionAccount item : tr.getAccounts()) { @@ -387,15 +428,16 @@ public final class MobileLedgerProfile { } @Nullable public LedgerAccount tryLoadAccount(SQLiteDatabase db, String accName) { - try (Cursor cursor = db.rawQuery( - "SELECT a.hidden, a.expanded, (select 1 from accounts a2 " + - "where a2.profile = a.profile and a2.name like a.name||':%' limit 1) " + - "FROM accounts a WHERE a.profile = ? and a.name=?", new String[]{uuid, accName})) + try (Cursor cursor = db.rawQuery("SELECT a.expanded, a.amounts_expanded, (select 1 from accounts a2 " + + "where a2.profile = a.profile and a2.name like a" + + ".name||':%' limit 1) " + + "FROM accounts a WHERE a.profile = ? and a.name=?", + new String[]{uuid, accName})) { if (cursor.moveToFirst()) { - LedgerAccount acc = new LedgerAccount(accName); - acc.setHiddenByStar(cursor.getInt(0) == 1); - acc.setExpanded(cursor.getInt(1) == 1); + LedgerAccount acc = new LedgerAccount(this, accName); + acc.setExpanded(cursor.getInt(0) == 1); + acc.setAmountsExpanded(cursor.getInt(1) == 1); acc.setHasSubAccounts(cursor.getInt(2) == 1); try (Cursor c2 = db.rawQuery( @@ -423,7 +465,7 @@ public final class MobileLedgerProfile { return this.themeHue; } public void setThemeHue(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o))); + setThemeId(Integer.parseInt(String.valueOf(o))); } public void setThemeId(int themeHue) { // debug("profile", String.format("Profile.setThemeHue(%d) called", themeHue)); @@ -510,7 +552,7 @@ public final class MobileLedgerProfile { db.execSQL("delete from transactions where profile=?", pUuid); db.execSQL("delete from transaction_accounts where profile=?", pUuid); db.setTransactionSuccessful(); - Logger.debug("wipe", String.format(Locale.ENGLISH, "Profile %s wiped out", pUuid[0])); + debug("wipe", String.format(Locale.ENGLISH, "Profile %s wiped out", pUuid[0])); } finally { db.endTransaction(); @@ -552,6 +594,15 @@ public final class MobileLedgerProfile { return null; } } + public Calendar getFirstTransactionDate() { + return firstTransactionDate; + } + public Calendar getLastTransactionDate() { + return lastTransactionDate; + } + public void setAccounts(ArrayList list) { + accounts.postValue(list); + } public enum FutureDates { None(0), OneWeek(7), TwoWeeks(14), OneMonth(30), TwoMonths(60), ThreeMonths(90), SixMonths(180), OneYear(365), All(-1); @@ -596,4 +647,42 @@ public final class MobileLedgerProfile { } } } + + static class AccountListLoader extends Thread { + MobileLedgerProfile profile; + AccountListLoader(MobileLedgerProfile profile) { + this.profile = profile; + } + @Override + public void run() { + Logger.debug("async-acc", "AccountListLoader::run() entered"); + String profileUUID = profile.getUuid(); + ArrayList newList = new ArrayList<>(); + + String sql = "SELECT a.name from accounts a WHERE a.profile = ?"; + sql += " ORDER BY a.name"; + + SQLiteDatabase db = App.getDatabase(); + try (Cursor cursor = db.rawQuery(sql, new String[]{profileUUID})) { + while (cursor.moveToNext()) { + if (isInterrupted()) + return; + + final String accName = cursor.getString(0); +// debug("accounts", +// String.format("Read account '%s' from DB [%s]", accName, +// profileUUID)); + LedgerAccount acc = profile.loadAccount(db, accName); + if (acc.isVisible(newList)) + newList.add(acc); + } + } + + if (isInterrupted()) + return; + + Logger.debug("async-acc", "AccountListLoader::run() posting new list"); + profile.accounts.postValue(newList); + } + } }