X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=956878e9b12bd0065df61074b6d8001e161e39d2;hb=62af7b6cac98df24ac41f33fad2c0c0ac05f63f0;hp=2cd159c5e7079c840e333f56da1e5c0c6eaf99a8;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;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 2cd159c5..956878e9 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -32,6 +32,7 @@ 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; @@ -50,7 +51,7 @@ public final class MobileLedgerProfile { private boolean authEnabled; private String authUserName; private String authPassword; - private int themeId; + private int themeHue; private int orderNo = -1; private FutureDates futureDates = FutureDates.None; private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto; @@ -69,7 +70,7 @@ public final class MobileLedgerProfile { authEnabled = origin.authEnabled; authUserName = origin.authUserName; authPassword = origin.authPassword; - themeId = origin.themeId; + themeHue = origin.themeHue; orderNo = origin.orderNo; futureDates = origin.futureDates; apiVersion = origin.apiVersion; @@ -82,8 +83,8 @@ public final class MobileLedgerProfile { 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 FROM " + - "profiles order by order_no", null)) + "preferred_accounts_filter, future_dates, api_version " + + "FROM " + "profiles order by order_no", null)) { while (cursor.moveToNext()) { MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0)); @@ -97,6 +98,7 @@ public final class MobileLedgerProfile { item.orderNo = cursor.getInt(8); item.setPreferredAccountsFilter(cursor.getString(9)); item.setFutureDates(cursor.getInt(10)); + item.setApiVersion(cursor.getInt(11)); list.add(item); if (item.getUuid() .equals(currentProfileUUID)) @@ -108,7 +110,7 @@ public final class MobileLedgerProfile { } public static void storeProfilesOrder() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { int orderNo = 0; for (MobileLedgerProfile p : Data.profiles.getValue()) { @@ -203,20 +205,20 @@ public final class MobileLedgerProfile { } public void storeInDB() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { // 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, preferred_accounts_filter, future_dates) " + - "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "auth_password, theme, order_no, preferred_accounts_filter, future_dates, " + + "api_version) " + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{uuid, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, - authEnabled ? authPassword : null, themeId, orderNo, - preferredAccountsFilter, futureDates.toInt() + authEnabled ? authPassword : null, themeHue, orderNo, + preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt() }); db.setTransactionSuccessful(); } @@ -242,7 +244,7 @@ public final class MobileLedgerProfile { 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(); @@ -259,9 +261,9 @@ public final class MobileLedgerProfile { 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() }); } // debug("profile", String.format("Transaction %d stored", tr.getId())); @@ -322,7 +324,7 @@ public final class MobileLedgerProfile { public void removeFromDB() { SQLiteDatabase db = App.getDatabase(); debug("db", String.format("removing profile %s from DB", uuid)); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { Object[] uuid_param = new Object[]{uuid}; db.execSQL("delete from profiles where uuid=?", uuid_param); @@ -389,17 +391,16 @@ public final class MobileLedgerProfile { return tr; } - public int getThemeId() { -// debug("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(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)) - .intValue()); + public void setThemeHue(Object o) { + setThemeId(Integer.valueOf(String.valueOf(o))); } - public void setThemeId(int themeId) { -// debug("profile", String.format("Profile.setThemeId(%d) called", themeId)); - this.themeId = themeId; + 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}); @@ -488,9 +489,45 @@ public final class MobileLedgerProfile { 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), OneMonth(30), TwoMonths(60), ThreeMonths(90), SixMonths(180), OneYear(365), - All(-1); + 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 { @@ -511,6 +548,10 @@ public final class MobileLedgerProfile { } 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: