X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=fddacf67d44e794bc84efcd97d2cefba22d3a255;hb=93545c6fbf1244fbd96ecfc50e1115dbdc25f9ae;hp=373f13257362f8ea831d9e9bf70286767ca0ceff;hpb=4f33c34223e62ce884916ac5cfa3969684807bb8;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 373f1325..fddacf67 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 © 2020 Damyan Ivanov. + * Copyright © 2021 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 @@ -17,35 +17,31 @@ package net.ktnx.mobileledger.model; +import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.os.Build; +import android.os.Bundle; import android.text.TextUtils; import android.util.SparseArray; 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.LockHolder; -import net.ktnx.mobileledger.utils.Locker; +import net.ktnx.mobileledger.json.API; +import net.ktnx.mobileledger.ui.profiles.ProfileDetailActivity; +import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; import net.ktnx.mobileledger.utils.Logger; -import net.ktnx.mobileledger.utils.MLDB; import net.ktnx.mobileledger.utils.Misc; import net.ktnx.mobileledger.utils.SimpleDate; import org.jetbrains.annotations.Contract; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -54,13 +50,8 @@ import java.util.Objects; import static net.ktnx.mobileledger.utils.Logger.debug; public final class MobileLedgerProfile { - private final MutableLiveData> displayedAccounts; - private final MutableLiveData> allTransactions; - private final MutableLiveData> displayedTransactions; // N.B. when adding new fields, update the copy-constructor below - private final String uuid; - private final Locker accountsLocker = new Locker(); - private List allAccounts; + private final long id; private String name; private boolean permitPosting; private boolean showCommentsByDefault; @@ -73,28 +64,18 @@ public final class MobileLedgerProfile { private String authPassword; private int themeHue; private int orderNo = -1; - private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto; - private Calendar firstTransactionDate; - private Calendar lastTransactionDate; + private API apiVersion = API.auto; private FutureDates futureDates = FutureDates.None; private boolean accountsLoaded; private boolean transactionsLoaded; + private HledgerVersion detectedVersion; // N.B. when adding new fields, update the copy-constructor below - transient private AccountListLoader loader = null; - transient private Thread displayedAccountsUpdater; - transient private AccountListSaver accountListSaver; - transient private TransactionListSaver transactionListSaver; transient private AccountAndTransactionListSaver accountAndTransactionListSaver; - private Map accountMap = new HashMap<>(); - public MobileLedgerProfile(String uuid) { - this.uuid = uuid; - allAccounts = new ArrayList<>(); - displayedAccounts = new MutableLiveData<>(); - allTransactions = new MutableLiveData<>(new ArrayList<>()); - displayedTransactions = new MutableLiveData<>(new ArrayList<>()); + public MobileLedgerProfile(long id) { + this.id = id; } public MobileLedgerProfile(MobileLedgerProfile origin) { - uuid = origin.uuid; + id = origin.id; name = origin.name; permitPosting = origin.permitPosting; showCommentsByDefault = origin.showCommentsByDefault; @@ -109,31 +90,27 @@ public final class MobileLedgerProfile { futureDates = origin.futureDates; apiVersion = origin.apiVersion; defaultCommodity = origin.defaultCommodity; - firstTransactionDate = origin.firstTransactionDate; - lastTransactionDate = origin.lastTransactionDate; - displayedAccounts = origin.displayedAccounts; - allAccounts = origin.allAccounts; - accountMap = origin.accountMap; - displayedTransactions = origin.displayedTransactions; - allTransactions = origin.allTransactions; accountsLoaded = origin.accountsLoaded; transactionsLoaded = origin.transactionsLoaded; + if (origin.detectedVersion != null) + detectedVersion = new HledgerVersion(origin.detectedVersion); } // loads all profiles into Data.profiles // returns the profile with the given UUID - public static MobileLedgerProfile loadAllFromDB(@Nullable String currentProfileUUID) { + public static MobileLedgerProfile loadAllFromDB(long currentProfileId) { MobileLedgerProfile result = null; ArrayList list = new ArrayList<>(); SQLiteDatabase db = App.getDatabase(); - try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + + try (Cursor cursor = db.rawQuery("SELECT id, 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, " + - "show_comments_by_default FROM " + + "show_comments_by_default, detected_version_pre_1_19, " + + "detected_version_major, detected_version_minor FROM " + "profiles order by order_no", null)) { while (cursor.moveToNext()) { - MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0)); + MobileLedgerProfile item = new MobileLedgerProfile(cursor.getLong(0)); item.setName(cursor.getString(1)); item.setUrl(cursor.getString(2)); item.setAuthEnabled(cursor.getInt(3) == 1); @@ -148,13 +125,27 @@ public final class MobileLedgerProfile { item.setShowCommodityByDefault(cursor.getInt(12) == 1); item.setDefaultCommodity(cursor.getString(13)); item.setShowCommentsByDefault(cursor.getInt(14) == 1); + { + boolean pre_1_20 = cursor.getInt(15) == 1; + int major = cursor.getInt(16); + int minor = cursor.getInt(17); + + if (!pre_1_20 && major == 0 && minor == 0) { + item.detectedVersion = null; + } + else if (pre_1_20) { + item.detectedVersion = new HledgerVersion(true); + } + else { + item.detectedVersion = new HledgerVersion(major, minor); + } + } list.add(item); - if (item.getUuid() - .equals(currentProfileUUID)) + if (item.getId() == currentProfileId) result = item; } } - Data.profiles.setValue(list); + Data.profiles.postValue(list); return result; } public static void storeProfilesOrder() { @@ -162,9 +153,9 @@ public final class MobileLedgerProfile { db.beginTransactionNonExclusive(); try { int orderNo = 0; - for (MobileLedgerProfile p : Data.profiles.getValue()) { + for (MobileLedgerProfile p : Objects.requireNonNull(Data.profiles.getValue())) { db.execSQL("update profiles set order_no=? where uuid=?", - new Object[]{orderNo, p.getUuid()}); + new Object[]{orderNo, p.getId()}); p.orderNo = orderNo; orderNo++; } @@ -174,66 +165,22 @@ public final class MobileLedgerProfile { db.endTransaction(); } } - public static ArrayList mergeAccountListsFromWeb(List oldList, - List newList) { - LedgerAccount oldAcc, newAcc; - ArrayList merged = new ArrayList<>(); - - Iterator oldIterator = oldList.iterator(); - Iterator newIterator = newList.iterator(); - - while (true) { - if (!oldIterator.hasNext()) { - // the rest of the incoming are new - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - newIterator.forEachRemaining(merged::add); - } - else { - while (newIterator.hasNext()) - merged.add(newIterator.next()); - } - break; - } - oldAcc = oldIterator.next(); - - if (!newIterator.hasNext()) { - // no more incoming accounts. ignore the rest of the old - break; - } - newAcc = newIterator.next(); - - // ignore now missing old items - if (oldAcc.getName() - .compareTo(newAcc.getName()) < 0) - continue; - - // add newly found items - if (oldAcc.getName() - .compareTo(newAcc.getName()) > 0) - { - merged.add(newAcc); - continue; - } - - // two items with same account names; forward-merge UI-controlled fields - // it is important that the result list contains a new LedgerAccount instance - // so that the change is propagated to the UI - newAcc.setExpanded(oldAcc.isExpanded()); - newAcc.setAmountsExpanded(oldAcc.amountsExpanded()); - merged.add(newAcc); + static public void startEditProfileActivity(Context context, MobileLedgerProfile profile) { + Intent intent = new Intent(context, ProfileDetailActivity.class); + Bundle args = new Bundle(); + if (profile != null) { + int index = Data.getProfileIndex(profile); + if (index != -1) + intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index); } - - return merged; + intent.putExtras(args); + context.startActivity(intent, args); } - public void mergeAccountListFromWeb(List newList) { - - try (LockHolder l = accountsLocker.lockForWriting()) { - allAccounts = mergeAccountListsFromWeb(allAccounts, newList); - updateAccountsMap(allAccounts); - } + public HledgerVersion getDetectedVersion() { + return detectedVersion; } - public LiveData> getDisplayedAccounts() { - return displayedAccounts; + public void setDetectedVersion(HledgerVersion detectedVersion) { + this.detectedVersion = detectedVersion; } @Contract(value = "null -> false", pure = true) @Override @@ -246,7 +193,7 @@ public final class MobileLedgerProfile { return false; MobileLedgerProfile p = (MobileLedgerProfile) obj; - if (!uuid.equals(p.uuid)) + if (id != p.id) return false; if (!name.equals(p.name)) return false; @@ -272,29 +219,10 @@ public final class MobileLedgerProfile { return false; if (apiVersion != p.apiVersion) return false; - if (!Objects.equals(firstTransactionDate, p.firstTransactionDate)) - return false; - if (!Objects.equals(lastTransactionDate, p.lastTransactionDate)) + if (!Objects.equals(detectedVersion, p.detectedVersion)) return false; return futureDates == p.futureDates; } - 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; } @@ -319,14 +247,14 @@ public final class MobileLedgerProfile { else this.defaultCommodity = String.valueOf(defaultCommodity); } - public SendTransactionTask.API getApiVersion() { + public API getApiVersion() { return apiVersion; } - public void setApiVersion(SendTransactionTask.API apiVersion) { + public void setApiVersion(API apiVersion) { this.apiVersion = apiVersion; } public void setApiVersion(int apiVersion) { - this.apiVersion = SendTransactionTask.API.valueOf(apiVersion); + this.apiVersion = API.valueOf(apiVersion); } public FutureDates getFutureDates() { return futureDates; @@ -352,8 +280,8 @@ public final class MobileLedgerProfile { public void setPostingPermitted(boolean permitPosting) { this.permitPosting = permitPosting; } - public String getUuid() { - return uuid; + public long getId() { + return id; } public String getName() { return name; @@ -405,16 +333,21 @@ public final class MobileLedgerProfile { // "url=%s, permit_posting=%s, authEnabled=%s, " + // "themeHue=%d", uuid, name, url, // permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeHue)); - db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " + + db.execSQL("REPLACE INTO profiles(id, 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, show_comments_by_default) " + - "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", - new Object[]{uuid, name, permitPosting, url, authEnabled, + "show_commodity_by_default, default_commodity, show_comments_by_default," + + "detected_version_pre_1_19, detected_version_major, " + + "detected_version_minor) " + + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + new Object[]{id, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, authEnabled ? authPassword : null, themeHue, orderNo, preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(), - showCommodityByDefault, defaultCommodity, showCommentsByDefault + showCommodityByDefault, defaultCommodity, showCommentsByDefault, + (detectedVersion != null) && detectedVersion.isPre_1_20_1(), + (detectedVersion == null) ? 0 : detectedVersion.getMajor(), + (detectedVersion == null) ? 0 : detectedVersion.getMinor() }); db.setTransactionSuccessful(); } @@ -434,35 +367,54 @@ public final class MobileLedgerProfile { params.add(acc.isExpanded() ? 1 : 0); } sql += " where profile=? and name=?"; - params.add(uuid); + params.add(id); params.add(acc.getName()); db.execSQL(sql, params.toArray()); db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level, " + "expanded, generation) select ?,?,?,?,?,0,? where (select changes() = 0)", - new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), + new Object[]{id, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), acc.getLevel(), generation }); // debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); } public void storeAccountValue(SQLiteDatabase db, int generation, String name, String currency, Float amount) { + if (!TextUtils.isEmpty(currency)) { + boolean exists; + try (Cursor c = db.rawQuery("select 1 from currencies where name=?", + new String[]{currency})) + { + exists = c.moveToFirst(); + } + if (!exists) { + db.execSQL( + "insert into currencies(id, name, position, has_gap) values((select max" + + "(id) from currencies)+1, ?, ?, ?)", new Object[]{currency, + Objects.requireNonNull( + Data.currencySymbolPosition.getValue()).toString(), + Data.currencyGap.getValue() + }); + } + } + db.execSQL("replace into account_values(profile, account, " + "currency, value, generation) values(?, ?, ?, ?, ?);", - new Object[]{uuid, name, Misc.emptyIsNull(currency), amount, generation}); + new Object[]{id, name, Misc.emptyIsNull(currency), amount, generation}); } public void storeTransaction(SQLiteDatabase db, int generation, LedgerTransaction tr) { tr.fillDataHash(); +// Logger.debug("storeTransaction", String.format(Locale.US, "ID %d", tr.getId())); SimpleDate d = tr.getDate(); db.execSQL("UPDATE transactions SET year=?, month=?, day=?, description=?, comment=?, " + "data_hash=?, generation=? WHERE profile=? AND id=?", new Object[]{d.year, d.month, d.day, tr.getDescription(), tr.getComment(), - tr.getDataHash(), generation, uuid, tr.getId() + tr.getDataHash(), generation, id, tr.getId() }); db.execSQL("INSERT INTO transactions(profile, id, year, month, day, description, " + "comment, data_hash, generation) " + "select ?,?,?,?,?,?,?,?,? WHERE (select changes() = 0)", - new Object[]{uuid, tr.getId(), tr.getDate().year, tr.getDate().month, + new Object[]{id, tr.getId(), tr.getDate().year, tr.getDate().month, tr.getDate().day, tr.getDescription(), tr.getComment(), tr.getDataHash(), generation }); @@ -474,12 +426,12 @@ public final class MobileLedgerProfile { "WHERE profile=? AND transaction_id=? AND order_no=?", new Object[]{item.getAccountName(), item.getAmount(), Misc.nullIsEmpty(item.getCurrency()), item.getComment(), - generation, uuid, tr.getId(), accountOrderNo + generation, id, tr.getId(), accountOrderNo }); db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " + "order_no, account_name, amount, currency, comment, generation) " + "select ?, ?, ?, ?, ?, ?, ?, ? WHERE (select changes() = 0)", - new Object[]{uuid, tr.getId(), accountOrderNo, item.getAccountName(), + new Object[]{id, tr.getId(), accountOrderNo, item.getAccountName(), item.getAmount(), Misc.nullIsEmpty(item.getCurrency()), item.getComment(), generation }); @@ -491,7 +443,7 @@ public final class MobileLedgerProfile { public String getOption(String name, String default_value) { SQLiteDatabase db = App.getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", - new String[]{uuid, name})) + new String[]{String.valueOf(id), name})) { if (cursor.moveToFirst()) { String result = cursor.getString(0); @@ -536,23 +488,23 @@ public final class MobileLedgerProfile { public void setOption(String name, String value) { debug("profile", String.format("setting option %s=%s", name, value)); DbOpQueue.add("insert or replace into options(profile, name, value) values(?, ?, ?);", - new String[]{uuid, name, value}); + new String[]{String.valueOf(id), name, value}); } public void setLongOption(String name, long value) { setOption(name, String.valueOf(value)); } public void removeFromDB() { SQLiteDatabase db = App.getDatabase(); - debug("db", String.format("removing profile %s from DB", uuid)); + debug("db", String.format(Locale.ROOT, "removing profile %d from DB", id)); db.beginTransactionNonExclusive(); try { - Object[] uuid_param = new Object[]{uuid}; - db.execSQL("delete from profiles where uuid=?", uuid_param); - db.execSQL("delete from accounts where profile=?", uuid_param); - db.execSQL("delete from account_values where profile=?", uuid_param); - db.execSQL("delete from transactions where profile=?", uuid_param); - db.execSQL("delete from transaction_accounts where profile=?", uuid_param); - db.execSQL("delete from options where profile=?", uuid_param); + Object[] id_param = new Object[]{id}; + db.execSQL("delete from transaction_accounts where profile=?", id_param); + db.execSQL("delete from transactions where profile=?", id_param); + db.execSQL("delete from account_values where profile=?", id_param); + db.execSQL("delete from accounts where profile=?", id_param); + db.execSQL("delete from options where profile=?", id_param); + db.execSQL("delete from profiles where uuid=?", id_param); db.setTransactionSuccessful(); } finally { @@ -560,7 +512,7 @@ public final class MobileLedgerProfile { } } public LedgerTransaction loadTransaction(int transactionId) { - LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid); + LedgerTransaction tr = new LedgerTransaction(transactionId, this.id); tr.loadData(App.getDatabase()); return tr; @@ -579,7 +531,7 @@ public final class MobileLedgerProfile { public int getNextTransactionsGeneration(SQLiteDatabase db) { int generation = 1; try (Cursor c = db.rawQuery("SELECT generation FROM transactions WHERE profile=? LIMIT 1", - new String[]{uuid})) + new String[]{String.valueOf(id)})) { if (c.moveToFirst()) { generation = c.getInt(0) + 1; @@ -590,7 +542,7 @@ public final class MobileLedgerProfile { private int getNextAccountsGeneration(SQLiteDatabase db) { int generation = 1; try (Cursor c = db.rawQuery("SELECT generation FROM accounts WHERE profile=? LIMIT 1", - new String[]{uuid})) + new String[]{String.valueOf(id)})) { if (c.moveToFirst()) { generation = c.getInt(0) + 1; @@ -601,30 +553,24 @@ public final class MobileLedgerProfile { private void deleteNotPresentAccounts(SQLiteDatabase db, int generation) { Logger.debug("db/benchmark", "Deleting obsolete accounts"); db.execSQL("DELETE FROM account_values WHERE profile=? AND generation <> ?", - new Object[]{uuid, generation}); + new Object[]{id, generation}); db.execSQL("DELETE FROM accounts WHERE profile=? AND generation <> ?", - new Object[]{uuid, generation}); + new Object[]{id, generation}); Logger.debug("db/benchmark", "Done deleting obsolete accounts"); } private void deleteNotPresentTransactions(SQLiteDatabase db, int generation) { Logger.debug("db/benchmark", "Deleting obsolete transactions"); db.execSQL("DELETE FROM transaction_accounts WHERE profile=? AND generation <> ?", - new Object[]{uuid, generation}); + new Object[]{id, generation}); db.execSQL("DELETE FROM transactions WHERE profile=? AND generation <> ?", - new Object[]{uuid, generation}); + new Object[]{id, generation}); Logger.debug("db/benchmark", "Done deleting obsolete transactions"); } - private void setLastUpdateStamp() { - debug("db", "Updating transaction value stamp"); - Date now = new Date(); - setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); - Data.lastUpdateDate.postValue(now); - } public void wipeAllData() { SQLiteDatabase db = App.getDatabase(); db.beginTransaction(); try { - String[] pUuid = new String[]{uuid}; + String[] pUuid = new String[]{String.valueOf(id)}; db.execSQL("delete from options where profile=?", pUuid); db.execSQL("delete from accounts where profile=?", pUuid); db.execSQL("delete from account_values where profile=?", pUuid); @@ -647,7 +593,7 @@ public final class MobileLedgerProfile { { while (c.moveToNext()) { Currency currency = new Currency(c.getInt(0), c.getString(1), - Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1); + Currency.Position.valueOf(c.getString(2)), c.getInt(3) == 1); result.add(currency); } } @@ -668,126 +614,44 @@ public final class MobileLedgerProfile { { if (cursor.moveToFirst()) { return new Currency(cursor.getInt(0), cursor.getString(1), - Currency.Position.valueOf(cursor.getInt(2)), cursor.getInt(3) == 1); + Currency.Position.valueOf(cursor.getString(2)), cursor.getInt(3) == 1); } return null; } } - public Calendar getFirstTransactionDate() { - return firstTransactionDate; - } - public Calendar getLastTransactionDate() { - return lastTransactionDate; - } - private void applyTransactionFilter(List list) { - final String accFilter = Data.accountFilter.getValue(); - if (TextUtils.isEmpty(accFilter)) { - displayedTransactions.postValue(list); - } - else { - ArrayList newList = new ArrayList<>(); - for (LedgerTransaction tr : list) { - if (tr.hasAccountNamedLike(accFilter)) - newList.add(tr); - } - displayedTransactions.postValue(newList); - } - } - synchronized public void storeAccountListAsync(List list, - boolean storeUiFields) { - if (accountListSaver != null) - accountListSaver.interrupt(); - accountListSaver = new AccountListSaver(this, list, storeUiFields); - accountListSaver.start(); - } - public void setAndStoreAccountListFromWeb(ArrayList list) { - SQLiteDatabase db = App.getDatabase(); - db.beginTransactionNonExclusive(); - try { - Logger.debug("db/benchmark", - String.format(Locale.US, "Storing %d accounts", list.size())); - int gen = getNextAccountsGeneration(db); - Logger.debug("db/benckmark", - String.format(Locale.US, "Got next generation of %d", gen)); - for (LedgerAccount acc : list) { - storeAccount(db, gen, acc, false); - for (LedgerAmount amt : acc.getAmounts()) { - storeAccountValue(db, gen, acc.getName(), amt.getCurrency(), amt.getAmount()); - } - } - Logger.debug("db/benchmark", "Done storing accounts"); - deleteNotPresentAccounts(db, gen); - setLastUpdateStamp(); - db.setTransactionSuccessful(); - } - finally { - db.endTransaction(); - } - - mergeAccountListFromWeb(list); - updateDisplayedAccounts(); - } - public synchronized Locker lockAccountsForWriting() { - accountsLocker.lockForWriting(); - return accountsLocker; - } - public void setAndStoreTransactionList(ArrayList list) { - storeTransactionListAsync(this, list); - - allTransactions.postValue(list); - } - private void storeTransactionListAsync(MobileLedgerProfile mobileLedgerProfile, - List list) { - if (transactionListSaver != null) - transactionListSaver.interrupt(); - - transactionListSaver = new TransactionListSaver(this, list); - transactionListSaver.start(); - } - public void setAndStoreAccountAndTransactionListFromWeb(List accounts, - List transactions) { - storeAccountAndTransactionListAsync(accounts, transactions, false); - - mergeAccountListFromWeb(accounts); - updateDisplayedAccounts(); - - allTransactions.postValue(transactions); - } - private void storeAccountAndTransactionListAsync(List accounts, - List transactions, - boolean storeAccUiFields) { + public void storeAccountAndTransactionListAsync(List accounts, + List transactions) { if (accountAndTransactionListSaver != null) accountAndTransactionListSaver.interrupt(); accountAndTransactionListSaver = - new AccountAndTransactionListSaver(this, accounts, transactions, storeAccUiFields); + new AccountAndTransactionListSaver(this, accounts, transactions); accountAndTransactionListSaver.start(); } - synchronized public void updateDisplayedAccounts() { - if (displayedAccountsUpdater != null) { - displayedAccountsUpdater.interrupt(); - } - displayedAccountsUpdater = new AccountListDisplayedFilter(this, allAccounts); - displayedAccountsUpdater.start(); - } - public List getAllAccounts() { - return allAccounts; - } - private void updateAccountsMap(List newAccounts) { - accountMap.clear(); - for (LedgerAccount acc : newAccounts) { - accountMap.put(acc.getName(), acc); + private Currency tryLoadCurrencyById(SQLiteDatabase db, int id) { + try (Cursor cursor = db.rawQuery( + "SELECT c.id, c.name, c.position, c.has_gap FROM currencies c WHERE c.id=?", + new String[]{String.valueOf(id)})) + { + if (cursor.moveToFirst()) { + return new Currency(cursor.getInt(0), cursor.getString(1), + Currency.Position.valueOf(cursor.getString(2)), cursor.getInt(3) == 1); + } + return null; } } - @Nullable - public LedgerAccount locateAccount(String name) { - return accountMap.get(name); + public Currency loadCurrencyById(int id) { + SQLiteDatabase db = App.getDatabase(); + Currency result = tryLoadCurrencyById(db, id); + if (result == null) + throw new RuntimeException(String.format("Unable to load currency with id '%d'", id)); + return result; } public enum FutureDates { None(0), OneWeek(7), TwoWeeks(14), OneMonth(30), TwoMonths(60), ThreeMonths(90), SixMonths(180), OneYear(365), All(-1); - private static SparseArray map = new SparseArray<>(); + private static final SparseArray map = new SparseArray<>(); static { for (FutureDates item : FutureDates.values()) { @@ -795,7 +659,7 @@ public final class MobileLedgerProfile { } } - private int value; + private final int value; FutureDates(int value) { this.value = value; } @@ -829,190 +693,34 @@ 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 list = new ArrayList<>(); - HashMap map = new HashMap<>(); - - String sql = "SELECT a.name, a.expanded, a.amounts_expanded"; - sql += " from accounts a WHERE a.profile = ?"; - sql += " ORDER BY a.name"; - - SQLiteDatabase db = App.getDatabase(); - Logger.debug("async-acc", "AccountListLoader::run() connected to DB"); - try (Cursor cursor = db.rawQuery(sql, new String[]{profileUUID})) { - Logger.debug("async-acc", "AccountListLoader::run() executed query"); - while (cursor.moveToNext()) { - if (isInterrupted()) - return; - - final String accName = cursor.getString(0); -// debug("accounts", -// String.format("Read account '%s' from DB [%s]", accName, -// profileUUID)); - String parentName = LedgerAccount.extractParentName(accName); - LedgerAccount parent; - if (parentName != null) { - parent = map.get(parentName); - if (parent == null) - throw new IllegalStateException( - String.format("Can't load account '%s': parent '%s' not loaded", - accName, parentName)); - parent.setHasSubAccounts(true); - } - else - parent = null; - - LedgerAccount acc = new LedgerAccount(profile, accName, parent); - acc.setExpanded(cursor.getInt(1) == 1); - acc.setAmountsExpanded(cursor.getInt(2) == 1); - acc.setHasSubAccounts(false); - - try (Cursor c2 = db.rawQuery( - "SELECT value, currency FROM account_values WHERE profile = ?" + " " + - "AND account = ?", new String[]{profileUUID, accName})) - { - while (c2.moveToNext()) { - acc.addAmount(c2.getFloat(0), c2.getString(1)); - } - } - - list.add(acc); - map.put(accName, acc); - } - Logger.debug("async-acc", "AccountListLoader::run() query execution done"); - } - - if (isInterrupted()) - return; - - Logger.debug("async-acc", "AccountListLoader::run() posting new list"); - profile.allAccounts = list; - profile.updateAccountsMap(list); - profile.updateDisplayedAccounts(); - } - } - - static class AccountListDisplayedFilter extends Thread { - private final MobileLedgerProfile profile; - private final List list; - AccountListDisplayedFilter(MobileLedgerProfile profile, List list) { - this.profile = profile; - this.list = list; - } - @Override - public void run() { - List newDisplayed = new ArrayList<>(); - Logger.debug("dFilter", "waiting for synchronized block"); - Logger.debug("dFilter", String.format(Locale.US, - "entered synchronized block (about to examine %d accounts)", list.size())); - for (LedgerAccount a : list) { - if (isInterrupted()) { - return; - } - - if (a.isVisible()) { - newDisplayed.add(a); - } - } - if (!isInterrupted()) { - profile.displayedAccounts.postValue(newDisplayed); - } - Logger.debug("dFilter", "left synchronized block"); - } - } - - private static class AccountListSaver extends Thread { - private final MobileLedgerProfile profile; - private final List list; - private final boolean storeUiFields; - AccountListSaver(MobileLedgerProfile profile, List list, - boolean storeUiFields) { - this.list = list; - this.profile = profile; - this.storeUiFields = storeUiFields; - } - @Override - public void run() { - SQLiteDatabase db = App.getDatabase(); - db.beginTransactionNonExclusive(); - try { - int generation = profile.getNextAccountsGeneration(db); - if (isInterrupted()) - return; - for (LedgerAccount acc : list) { - profile.storeAccount(db, generation, acc, storeUiFields); - if (isInterrupted()) - return; - } - profile.deleteNotPresentAccounts(db, generation); - if (isInterrupted()) - return; - profile.setLastUpdateStamp(); - db.setTransactionSuccessful(); - } - finally { - db.endTransaction(); - } - } - } - - private static class TransactionListSaver extends Thread { - private final MobileLedgerProfile profile; - private final List list; - TransactionListSaver(MobileLedgerProfile profile, List list) { - this.list = list; - this.profile = profile; - } - @Override - public void run() { - SQLiteDatabase db = App.getDatabase(); - db.beginTransactionNonExclusive(); - try { - Logger.debug("db/benchmark", - String.format(Locale.US, "Storing %d transactions", list.size())); - int generation = profile.getNextTransactionsGeneration(db); - Logger.debug("db/benchmark", - String.format(Locale.US, "Got next generation of %d", generation)); - if (isInterrupted()) - return; - for (LedgerTransaction tr : list) { - profile.storeTransaction(db, generation, tr); - if (isInterrupted()) - return; - } - Logger.debug("db/benchmark", "Done storing transactions"); - profile.deleteNotPresentTransactions(db, generation); - if (isInterrupted()) - return; - profile.setLastUpdateStamp(); - db.setTransactionSuccessful(); - } - finally { - db.endTransaction(); - } - } - } - private static class AccountAndTransactionListSaver extends Thread { private final MobileLedgerProfile profile; private final List accounts; private final List transactions; - private final boolean storeAccUiFields; AccountAndTransactionListSaver(MobileLedgerProfile profile, List accounts, - List transactions, - boolean storeAccUiFields) { + List transactions) { this.accounts = accounts; this.transactions = transactions; this.profile = profile; - this.storeAccUiFields = storeAccUiFields; + } + public int getNextDescriptionsGeneration(SQLiteDatabase db) { + int generation = 1; + try (Cursor c = db.rawQuery("SELECT generation FROM description_history LIMIT 1", + null)) + { + if (c.moveToFirst()) { + generation = c.getInt(0) + 1; + } + } + return generation; + } + void deleteNotPresentDescriptions(SQLiteDatabase db, int generation) { + Logger.debug("db/benchmark", "Deleting obsolete descriptions"); + db.execSQL("DELETE FROM description_history WHERE generation <> ?", + new Object[]{generation}); + db.execSQL("DELETE FROM description_history WHERE generation <> ?", + new Object[]{generation}); + Logger.debug("db/benchmark", "Done deleting obsolete descriptions"); } @Override public void run() { @@ -1024,32 +732,54 @@ public final class MobileLedgerProfile { return; int transactionsGeneration = profile.getNextTransactionsGeneration(db); - if (isInterrupted()) { + if (isInterrupted()) return; - } for (LedgerAccount acc : accounts) { - profile.storeAccount(db, accountsGeneration, acc, storeAccUiFields); + profile.storeAccount(db, accountsGeneration, acc, false); if (isInterrupted()) return; + for (LedgerAmount amt : acc.getAmounts()) { + profile.storeAccountValue(db, accountsGeneration, acc.getName(), + amt.getCurrency(), amt.getAmount()); + if (isInterrupted()) + return; + } } for (LedgerTransaction tr : transactions) { profile.storeTransaction(db, transactionsGeneration, tr); - if (isInterrupted()) { + if (isInterrupted()) return; - } } - profile.deleteNotPresentAccounts(db, accountsGeneration); + profile.deleteNotPresentTransactions(db, transactionsGeneration); if (isInterrupted()) { return; } - profile.deleteNotPresentTransactions(db, transactionsGeneration); + profile.deleteNotPresentAccounts(db, accountsGeneration); if (isInterrupted()) return; - profile.setLastUpdateStamp(); + Map unique = new HashMap<>(); + + debug("descriptions", "Starting refresh"); + int descriptionsGeneration = getNextDescriptionsGeneration(db); + try (Cursor c = db.rawQuery("SELECT distinct description from transactions", + null)) + { + while (c.moveToNext()) { + String description = c.getString(0); + String descriptionUpper = description.toUpperCase(); + if (unique.containsKey(descriptionUpper)) + continue; + + storeDescription(db, descriptionsGeneration, description, descriptionUpper); + + unique.put(descriptionUpper, true); + } + } + deleteNotPresentDescriptions(db, descriptionsGeneration); db.setTransactionSuccessful(); } @@ -1057,5 +787,16 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + private void storeDescription(SQLiteDatabase db, int generation, String description, + String descriptionUpper) { + db.execSQL("UPDATE description_history SET description=?, generation=? WHERE " + + "description_upper=?", new Object[]{description, generation, descriptionUpper + }); + db.execSQL( + "INSERT INTO description_history(description, description_upper, generation) " + + "select ?,?,? WHERE (select changes() = 0)", + new Object[]{description, descriptionUpper, generation + }); + } } }