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=6e5ac129f4da2b87c413ffa09cf03edaab9decc4;hp=36e317af42be4a0714a76a1e483891ab1953bee0;hb=dcd151c241104f520aae69c2074a6559e897b625;hpb=b06a7a291e35add2dfc89313d226c5efd1bae3b3

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 36e317af..6e5ac129 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();
@@ -219,7 +221,7 @@ public final class MobileLedgerProfile {
         }
         Log.d("profile", String.format("Transaction %d stored", tr.getId()));
     }
-    public String get_option_value(String name, String default_value) {
+    public String getOption(String name, String default_value) {
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
                 new String[]{uuid, name}))
@@ -242,9 +244,9 @@ public final class MobileLedgerProfile {
             return default_value;
         }
     }
-    public long get_option_value(String name, long default_value) {
+    public long getLongOption(String name, long default_value) {
         long longResult;
-        String result = get_option_value(name, "");
+        String result = getOption(name, "");
         if ((result == null) || result.isEmpty()) {
             Log.d("profile", String.format("Returning default value for option %s", name));
             longResult = default_value;
@@ -262,18 +264,33 @@ public final class MobileLedgerProfile {
 
         return longResult;
     }
-    public void set_option_value(String name, String value) {
+    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(?, ?, ?);",
                 new String[]{uuid, name, value});
     }
-    public void set_option_value(String name, long value) {
-        set_option_value(name, String.valueOf(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});
     }
+    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;
+    }
 }