X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=925e05eb3fd95ef3ddd64efd83c3b654ead3c0b7;hp=9d87d0c8e73fbb9d62ce44956a8386b11945df38;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=3d6624b7751fa97edf71b7b1398867357aedb90d 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 9d87d0c8..925e05eb 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 @@ -17,91 +17,116 @@ package net.ktnx.mobileledger.model; +import android.content.res.Resources; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; +import android.util.SparseArray; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +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.Date; import java.util.List; +import java.util.Locale; import java.util.UUID; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +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; private String url; private boolean authEnabled; private String authUserName; private String authPassword; - private int themeId; + private int themeHue; private int orderNo = -1; - public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url, - boolean authEnabled, String authUserName, String authPassword) { - this(uuid, name, permitPosting, url, authEnabled, authUserName, authPassword, -1); - + // N.B. when adding new fields, update the copy-constructor below + private FutureDates futureDates = FutureDates.None; + private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto; + public MobileLedgerProfile() { + this.uuid = String.valueOf(UUID.randomUUID()); } - public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url, - boolean authEnabled, String authUserName, String authPassword, - int themeId) { + public MobileLedgerProfile(String uuid) { this.uuid = uuid; - this.name = name; - this.permitPosting = permitPosting; - this.url = url; - this.authEnabled = authEnabled; - this.authUserName = authUserName; - this.authPassword = authPassword; - this.themeId = themeId; - this.orderNo = -1; } - public MobileLedgerProfile(CharSequence name, boolean permitPosting, CharSequence url, - boolean authEnabled, CharSequence authUserName, - CharSequence authPassword, int themeId) { - this.uuid = String.valueOf(UUID.randomUUID()); - this.name = String.valueOf(name); - this.permitPosting = permitPosting; - this.url = String.valueOf(url); - this.authEnabled = authEnabled; - this.authUserName = String.valueOf(authUserName); - this.authPassword = String.valueOf(authPassword); - this.themeId = themeId; - this.orderNo = -1; + public MobileLedgerProfile(MobileLedgerProfile origin) { + uuid = origin.uuid; + name = origin.name; + permitPosting = origin.permitPosting; + showCommentsByDefault = origin.showCommentsByDefault; + showCommodityByDefault = origin.showCommodityByDefault; + preferredAccountsFilter = origin.preferredAccountsFilter; + url = origin.url; + authEnabled = origin.authEnabled; + authUserName = origin.authUserName; + authPassword = origin.authPassword; + themeHue = origin.themeHue; + orderNo = origin.orderNo; + futureDates = origin.futureDates; + apiVersion = origin.apiVersion; + defaultCommodity = origin.defaultCommodity; } // loads all profiles into Data.profiles // returns the profile with the given UUID public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) { MobileLedgerProfile result = null; - List list = new ArrayList<>(); - SQLiteDatabase db = MLDB.getDatabase(); + 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 FROM " + + "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 " + "profiles order by order_no", null)) { while (cursor.moveToNext()) { - MobileLedgerProfile item = - new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), - cursor.getInt(6) == 1, cursor.getString(2), cursor.getInt(3) == 1, - cursor.getString(4), cursor.getString(5), cursor.getInt(7)); + MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0)); + item.setName(cursor.getString(1)); + item.setUrl(cursor.getString(2)); + item.setAuthEnabled(cursor.getInt(3) == 1); + item.setAuthUserName(cursor.getString(4)); + item.setAuthPassword(cursor.getString(5)); + item.setPostingPermitted(cursor.getInt(6) == 1); + item.setThemeId(cursor.getInt(7)); item.orderNo = cursor.getInt(8); + item.setPreferredAccountsFilter(cursor.getString(9)); + item.setFutureDates(cursor.getInt(10)); + 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)) result = item; + if (item.getUuid() + .equals(currentProfileUUID)) + result = item; } } - Data.profiles.setList(list); + Data.profiles.setValue(list); return result; } public static void storeProfilesOrder() { - SQLiteDatabase db = MLDB.getDatabase(); - db.beginTransaction(); + SQLiteDatabase db = App.getDatabase(); + db.beginTransactionNonExclusive(); try { int orderNo = 0; - for (MobileLedgerProfile p : Data.profiles.getList()) { + for (MobileLedgerProfile p : Data.profiles.getValue()) { db.execSQL("update profiles set order_no=? where uuid=?", new Object[]{orderNo, p.getUuid()}); p.orderNo = orderNo; @@ -113,6 +138,57 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + public boolean getShowCommentsByDefault() { + return showCommentsByDefault; + } + public void setShowCommentsByDefault(boolean newValue) { + this.showCommentsByDefault = newValue; + } + public boolean getShowCommodityByDefault() { + return showCommodityByDefault; + } + public void setShowCommodityByDefault(boolean showCommodityByDefault) { + this.showCommodityByDefault = showCommodityByDefault; + } + public String getDefaultCommodity() { + return defaultCommodity; + } + public void setDefaultCommodity(String defaultCommodity) { + this.defaultCommodity = defaultCommodity; + } + public void setDefaultCommodity(CharSequence defaultCommodity) { + if (defaultCommodity == null) + this.defaultCommodity = null; + else + this.defaultCommodity = String.valueOf(defaultCommodity); + } + public SendTransactionTask.API getApiVersion() { + return apiVersion; + } + public void setApiVersion(SendTransactionTask.API apiVersion) { + this.apiVersion = apiVersion; + } + public void setApiVersion(int apiVersion) { + this.apiVersion = SendTransactionTask.API.valueOf(apiVersion); + } + public FutureDates getFutureDates() { + return futureDates; + } + public void setFutureDates(int anInt) { + futureDates = FutureDates.valueOf(anInt); + } + public void setFutureDates(FutureDates futureDates) { + this.futureDates = futureDates; + } + public String getPreferredAccountsFilter() { + return preferredAccountsFilter; + } + public void setPreferredAccountsFilter(String preferredAccountsFilter) { + this.preferredAccountsFilter = preferredAccountsFilter; + } + public void setPreferredAccountsFilter(CharSequence preferredAccountsFilter) { + setPreferredAccountsFilter(String.valueOf(preferredAccountsFilter)); + } public boolean isPostingPermitted() { return permitPosting; } @@ -125,21 +201,21 @@ public final class MobileLedgerProfile { public String getName() { return name; } - public void setName(String name) { - this.name = name; - } public void setName(CharSequence text) { setName(String.valueOf(text)); } + public void setName(String name) { + this.name = name; + } public String getUrl() { return url; } - public void setUrl(String url) { - this.url = url; - } public void setUrl(CharSequence text) { setUrl(String.valueOf(text)); } + public void setUrl(String url) { + this.url = url; + } public boolean isAuthEnabled() { return authEnabled; } @@ -149,35 +225,39 @@ public final class MobileLedgerProfile { public String getAuthUserName() { return authUserName; } - public void setAuthUserName(String authUserName) { - this.authUserName = authUserName; - } public void setAuthUserName(CharSequence text) { setAuthUserName(String.valueOf(text)); } + public void setAuthUserName(String authUserName) { + this.authUserName = authUserName; + } public String getAuthPassword() { return authPassword; } - public void setAuthPassword(String authPassword) { - this.authPassword = authPassword; - } public void setAuthPassword(CharSequence text) { setAuthPassword(String.valueOf(text)); } + public void setAuthPassword(String authPassword) { + this.authPassword = authPassword; + } public void storeInDB() { - SQLiteDatabase db = MLDB.getDatabase(); - db.beginTransaction(); + SQLiteDatabase db = App.getDatabase(); + db.beginTransactionNonExclusive(); try { -// Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + +// debug("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + // "url=%s, permit_posting=%s, authEnabled=%s, " + -// "themeId=%d", uuid, name, url, -// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeId)); +// "themeHue=%d", uuid, name, url, +// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeHue)); db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " + - "use_authentication, auth_user, " + - "auth_password, theme, order_no) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", + "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, authEnabled ? authUserName : null, - authEnabled ? authPassword : null, themeId, orderNo + authEnabled ? authPassword : null, themeHue, orderNo, + preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(), + showCommodityByDefault, defaultCommodity, showCommentsByDefault }); db.setTransactionSuccessful(); } @@ -193,18 +273,17 @@ public final class MobileLedgerProfile { new Object[]{acc.getLevel(), acc.isHiddenByStar(), 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, hidden, " + + "expanded, keep) " + "select ?,?,?,?,?,?,?,1 where (select changes() = 0)", new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded() }); -// Log.d("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); +// debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); } public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) { db.execSQL("replace into account_values(profile, account, " + "currency, value, keep) values(?, ?, ?, ?, 1);", - new Object[]{uuid, name, currency, amount}); + new Object[]{uuid, name, Misc.emptyIsNull(currency), amount}); } public void storeTransaction(SQLiteDatabase db, LedgerTransaction tr) { tr.fillDataHash(); @@ -213,23 +292,26 @@ 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()) { db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " + - "account_name, amount, currency) values(?, ?, ?, ?, ?)", + "account_name, amount, currency, comment) values(?, ?, ?, ?, ?, ?)", new Object[]{uuid, tr.getId(), item.getAccountName(), item.getAmount(), - item.getCurrency() + Misc.nullIsEmpty(item.getCurrency()), item.getComment() }); } - Log.d("profile", String.format("Transaction %d stored", tr.getId())); +// debug("profile", String.format("Transaction %d stored", tr.getId())); } public String getOption(String name, String default_value) { - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", new String[]{uuid, name})) { @@ -237,17 +319,19 @@ public final class MobileLedgerProfile { String result = cursor.getString(0); if (result == null) { - Log.d("profile", "returning default value for " + name); + debug("profile", "returning default value for " + name); result = default_value; } - else Log.d("profile", String.format("option %s=%s", name, result)); + else + debug("profile", String.format("option %s=%s", name, result)); return result; } - else return default_value; + else + return default_value; } catch (Exception e) { - Log.d("db", "returning default value for " + name, e); + debug("db", "returning default value for " + name, e); return default_value; } } @@ -255,16 +339,16 @@ public final class MobileLedgerProfile { long longResult; String result = getOption(name, ""); if ((result == null) || result.isEmpty()) { - Log.d("profile", String.format("Returning default value for option %s", name)); + debug("profile", String.format("Returning default value for option %s", name)); longResult = default_value; } else { try { longResult = Long.parseLong(result); - Log.d("profile", String.format("option %s=%s", name, result)); + debug("profile", String.format("option %s=%s", name, result)); } catch (Exception e) { - Log.d("profile", String.format("Returning default value for option %s", name), e); + debug("profile", String.format("Returning default value for option %s", name), e); longResult = default_value; } } @@ -272,24 +356,25 @@ public final class MobileLedgerProfile { return longResult; } public void setOption(String name, String value) { - Log.d("profile", String.format("setting option %s=%s", name, value)); - SQLiteDatabase db = MLDB.getDatabase(); - db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);", + 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}); } public void setLongOption(String name, long value) { setOption(name, String.valueOf(value)); } public void removeFromDB() { - SQLiteDatabase db = MLDB.getDatabase(); - Log.d("db", String.format("removing profile %s from DB", uuid)); - db.beginTransaction(); + SQLiteDatabase db = App.getDatabase(); + debug("db", String.format("removing profile %s from DB", uuid)); + db.beginTransactionNonExclusive(); try { - db.execSQL("delete from profiles where uuid=?", new Object[]{uuid}); - db.execSQL("delete from accounts where profile=?", new Object[]{uuid}); - db.execSQL("delete from account_values where profile=?", new Object[]{uuid}); - db.execSQL("delete from transactions where profile=?", new Object[]{uuid}); - db.execSQL("delete from transaction_accounts where profile=?", new Object[]{uuid}); + 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); db.setTransactionSuccessful(); } finally { @@ -298,19 +383,20 @@ public final class MobileLedgerProfile { } @NonNull public LedgerAccount loadAccount(String name) { - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); return loadAccount(db, name); } @Nullable public LedgerAccount tryLoadAccount(String acct_name) { - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); return tryLoadAccount(db, acct_name); } @NonNull public LedgerAccount loadAccount(SQLiteDatabase db, String accName) { LedgerAccount acc = tryLoadAccount(db, accName); - if (acc == null) throw new RuntimeException("Unable to load account with name " + accName); + if (acc == null) + throw new RuntimeException("Unable to load account with name " + accName); return acc; } @@ -343,20 +429,20 @@ public final class MobileLedgerProfile { } public LedgerTransaction loadTransaction(int transactionId) { LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid); - tr.loadData(MLDB.getDatabase()); + tr.loadData(App.getDatabase()); return tr; } - public int getThemeId() { -// Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId)); - return this.themeId; + public int getThemeHue() { +// debug("profile", String.format("Profile.getThemeHue() returning %d", themeHue)); + return this.themeHue; } - public void setThemeId(int themeId) { -// Log.d("profile", String.format("Profile.setThemeId(%d) called", themeId)); - this.themeId = themeId; + public void setThemeHue(Object o) { + setThemeId(Integer.parseInt(String.valueOf(o))); } - public void setThemeId(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); + public void setThemeId(int themeHue) { +// debug("profile", String.format("Profile.setThemeHue(%d) called", themeHue)); + this.themeHue = themeHue; } public void markTransactionsAsNotPresent(SQLiteDatabase db) { db.execSQL("UPDATE transactions set keep=0 where profile=?", new String[]{uuid}); @@ -387,14 +473,14 @@ public final class MobileLedgerProfile { db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0", new String[]{uuid}); } public void setLastUpdateStamp() { - Log.d("db", "Updating transaction value stamp"); + debug("db", "Updating transaction value stamp"); Date now = new Date(); setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); - Data.lastUpdateDate.set(now); + Data.lastUpdateDate.postValue(now); } public List loadChildAccountsOf(LedgerAccount acc) { List result = new ArrayList<>(); - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor c = db.rawQuery( "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", new String[]{uuid, acc.getName()})) @@ -412,7 +498,7 @@ public final class MobileLedgerProfile { ArrayList visibleList = new ArrayList<>(); visibleList.add(acc); - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor c = db.rawQuery( "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", new String[]{uuid, acc.getName()})) @@ -428,4 +514,101 @@ public final class MobileLedgerProfile { return result; } + public void wipeAllData() { + SQLiteDatabase db = App.getDatabase(); + db.beginTransaction(); + try { + String[] pUuid = new String[]{uuid}; + 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); + 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])); + } + finally { + db.endTransaction(); + } + } + public List getCurrencies() { + SQLiteDatabase db = App.getDatabase(); + + ArrayList result = new ArrayList<>(); + + try (Cursor c = db.rawQuery("SELECT c.id, c.name, c.position, c.has_gap FROM currencies c", + new String[]{})) + { + while (c.moveToNext()) { + Currency currency = new Currency(c.getInt(0), c.getString(1), + Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1); + result.add(currency); + } + } + + return result; + } + Currency loadCurrencyByName(String name) { + SQLiteDatabase db = App.getDatabase(); + Currency result = tryLoadCurrencyByName(db, name); + if (result == null) + throw new RuntimeException(String.format("Unable to load currency '%s'", name)); + return result; + } + private Currency tryLoadCurrencyByName(SQLiteDatabase db, String name) { + try (Cursor cursor = db.rawQuery( + "SELECT c.id, c.name, c.position, c.has_gap FROM currencies c WHERE c.name=?", + new String[]{name})) + { + if (cursor.moveToFirst()) { + return new Currency(cursor.getInt(0), cursor.getString(1), + Currency.Position.valueOf(cursor.getInt(2)), cursor.getInt(3) == 1); + } + return null; + } + } + 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<>(); + + static { + for (FutureDates item : FutureDates.values()) { + map.put(item.value, item); + } + } + + private int value; + FutureDates(int value) { + this.value = value; + } + public static FutureDates valueOf(int i) { + return map.get(i, None); + } + public int toInt() { + return this.value; + } + public String getText(Resources resources) { + switch (value) { + case 7: + return resources.getString(R.string.future_dates_7); + case 14: + return resources.getString(R.string.future_dates_14); + case 30: + return resources.getString(R.string.future_dates_30); + case 60: + return resources.getString(R.string.future_dates_60); + case 90: + return resources.getString(R.string.future_dates_90); + case 180: + return resources.getString(R.string.future_dates_180); + case 365: + return resources.getString(R.string.future_dates_365); + case -1: + return resources.getString(R.string.future_dates_all); + default: + return resources.getString(R.string.future_dates_none); + } + } + } }