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=9731e3e6b4eb7689e422fc7ba697ff13b0532a7e;hp=ab4d70105fdee8c842a5bf4f771253b4511b93c2;hb=7165b89c8ff2b9d8f69e02354197127ec27a4a47;hpb=9d7700a808b96834c01f13f099f36fc0a49df74f 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 ab4d7010..9731e3e6 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -21,7 +21,9 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.util.Log; +import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.utils.Globals; +import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; @@ -29,6 +31,9 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + public final class MobileLedgerProfile { private String uuid; private String name; @@ -75,7 +80,7 @@ public final class MobileLedgerProfile { public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) { MobileLedgerProfile result = null; List list = new ArrayList<>(); - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + "auth_password, permit_posting, theme, order_no FROM " + "profiles order by order_no", null)) @@ -94,15 +99,18 @@ public final class MobileLedgerProfile { return result; } public static void storeProfilesOrder() { - SQLiteDatabase db = MLDB.getWritableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); db.beginTransaction(); try { int orderNo = 0; - for (MobileLedgerProfile p : Data.profiles.getList()) { - db.execSQL("update profiles set order_no=? where uuid=?", - new Object[]{orderNo, p.getUuid()}); - p.orderNo = orderNo; - orderNo++; + try (LockHolder lh = Data.profiles.lockForReading()) { + for (int i = 0; i < Data.profiles.size(); i++) { + MobileLedgerProfile p = Data.profiles.get(i); + db.execSQL("update profiles set order_no=? where uuid=?", + new Object[]{orderNo, p.getUuid()}); + p.orderNo = orderNo; + orderNo++; + } } db.setTransactionSuccessful(); } @@ -122,21 +130,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; } @@ -146,23 +154,23 @@ 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.getWritableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); db.beginTransaction(); try { // Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + @@ -185,13 +193,18 @@ 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 where profile=? and name = ?", - new Object[]{acc.getLevel(), uuid, acc.getName()}); - db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level, keep) " + - "select ?,?,?,?,?,1 where (select changes() = 0)", + db.execSQL("update accounts set level = ?, keep = 1, hidden=?, expanded=? " + + "where profile=? and name = ?", + 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)", new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), - acc.getLevel() + acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded() }); +// Log.d("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, " + @@ -221,7 +234,7 @@ public final class MobileLedgerProfile { Log.d("profile", String.format("Transaction %d stored", tr.getId())); } public String getOption(String name, String default_value) { - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", new String[]{uuid, name})) { @@ -265,36 +278,76 @@ public final class MobileLedgerProfile { } public void setOption(String name, String value) { Log.d("profile", String.format("setting option %s=%s", name, value)); - SQLiteDatabase db = MLDB.getWritableDatabase(); - db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);", + 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.getWritableDatabase(); - Log.d("db", String.format("removing progile %s from DB", uuid)); - db.execSQL("delete from profiles where uuid=?", new Object[]{uuid}); + SQLiteDatabase db = MLDB.getDatabase(); + Log.d("db", String.format("removing profile %s from DB", uuid)); + db.beginTransaction(); + 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}); + db.setTransactionSuccessful(); + } + finally { + db.endTransaction(); + } } + @NonNull public LedgerAccount loadAccount(String name) { - SQLiteDatabase db = MLDB.getReadableDatabase(); - try (Cursor cursor = db.rawQuery("SELECT hidden from accounts where profile=? and name=?", - new String[]{uuid, name})) + SQLiteDatabase db = MLDB.getDatabase(); + return loadAccount(db, name); + } + @Nullable + public LedgerAccount tryLoadAccount(String acct_name) { + SQLiteDatabase db = MLDB.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); + + return acc; + } + @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})) { if (cursor.moveToFirst()) { - LedgerAccount acc = new LedgerAccount(name); - acc.setHidden(cursor.getInt(0) == 1); + LedgerAccount acc = new LedgerAccount(accName); + acc.setHiddenByStar(cursor.getInt(0) == 1); + acc.setExpanded(cursor.getInt(1) == 1); + acc.setHasSubAccounts(cursor.getInt(2) == 1); + + try (Cursor c2 = db.rawQuery( + "SELECT value, currency FROM account_values WHERE profile = ? " + + "AND account = ?", new String[]{uuid, accName})) + { + while (c2.moveToNext()) { + acc.addAmount(c2.getFloat(0), c2.getString(1)); + } + } return acc; } + return null; } - - return null; } public LedgerTransaction loadTransaction(int transactionId) { LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid); - tr.loadData(MLDB.getReadableDatabase()); + tr.loadData(MLDB.getDatabase()); return tr; } @@ -302,13 +355,13 @@ public final class MobileLedgerProfile { // Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId)); return this.themeId; } + public void setThemeId(Object o) { + setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); + } public void setThemeId(int themeId) { // Log.d("profile", String.format("Profile.setThemeId(%d) called", themeId)); this.themeId = themeId; } - public void setThemeId(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); - } public void markTransactionsAsNotPresent(SQLiteDatabase db) { db.execSQL("UPDATE transactions set keep=0 where profile=?", new String[]{uuid}); @@ -343,4 +396,40 @@ public final class MobileLedgerProfile { setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); Data.lastUpdateDate.set(now); } + public List loadChildAccountsOf(LedgerAccount acc) { + List result = new ArrayList<>(); + SQLiteDatabase db = MLDB.getDatabase(); + try (Cursor c = db.rawQuery( + "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", + new String[]{uuid, acc.getName()})) + { + while (c.moveToNext()) { + LedgerAccount a = loadAccount(db, c.getString(0)); + result.add(a); + } + } + + return result; + } + public List loadVisibleChildAccountsOf(LedgerAccount acc) { + List result = new ArrayList<>(); + ArrayList visibleList = new ArrayList<>(); + visibleList.add(acc); + + SQLiteDatabase db = MLDB.getDatabase(); + try (Cursor c = db.rawQuery( + "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", + new String[]{uuid, acc.getName()})) + { + while (c.moveToNext()) { + LedgerAccount a = loadAccount(db, c.getString(0)); + if (a.isVisible(visibleList)) { + result.add(a); + visibleList.add(a); + } + } + } + + return result; + } }