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=6fc2551f592d650fb6a396e1d92d025b2119d8fe;hp=bbcf57fa7696041816c31d705d16996bc7b70ee1;hb=2fe366bc4f382a35ef1379a158a6131ca89bdb9e;hpb=5288da587233a9203d4abcaf7840dc62db2fb294 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 bbcf57fa..6fc2551f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -180,16 +180,18 @@ public final class MobileLedgerProfile { db.endTransaction(); } } - public void storeAccount(String name) { + public void storeAccount(LedgerAccount acc) { SQLiteDatabase db = MLDB.getWritableDatabase(); - do { - LedgerAccount acc = new LedgerAccount(name); - db.execSQL("replace into accounts(profile, name, name_upper, level, keep) values(?, " + - "?, ?, ?, 1)", - new Object[]{this.uuid, name, name.toUpperCase(), acc.getLevel()}); - name = acc.getParentName(); - } while (name != null); + // 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) " + + "select ?,?,?,?,? where (select changes() = 0)", + new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), + acc.getLevel() + }); } public void storeAccountValue(String name, String currency, Float amount) { SQLiteDatabase db = MLDB.getWritableDatabase(); @@ -273,7 +275,22 @@ public final class MobileLedgerProfile { } public void removeFromDB() { SQLiteDatabase db = MLDB.getWritableDatabase(); - Log.d("db", String.format("removinf progile %s from DB", uuid)); + Log.d("db", String.format("removing progile %s from DB", uuid)); db.execSQL("delete from profiles where uuid=?", new Object[]{uuid}); } + 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})) + { + if (cursor.moveToFirst()) { + LedgerAccount acc = new LedgerAccount(name); + acc.setHidden(cursor.getInt(0) == 1); + + return acc; + } + } + + return null; + } }