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=038515bfb02e4ec32e01293476c179c878276f22;hb=2fe366bc4f382a35ef1379a158a6131ca89bdb9e;hpb=94aa0aa57db3dce40f31fc0321c718998d9cb48b

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 038515bf..6fc2551f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -56,15 +56,32 @@ public final class MobileLedgerProfile {
         List<MobileLedgerProfile> result = new ArrayList<>();
         SQLiteDatabase db = MLDB.getReadableDatabase();
         try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
-                                         "auth_password FROM profiles", null))
+                                         "auth_password FROM profiles order by order_no", null))
         {
             while (cursor.moveToNext()) {
-                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
+                result.add(new MobileLedgerProfile(cursor.getString(0), cursor.getString(1),
+                        cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4),
                         cursor.getString(5)));
             }
         }
         return result;
     }
+    public static void storeProfilesOrder() {
+        SQLiteDatabase db = MLDB.getWritableDatabase();
+        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()});
+                orderNo++;
+            }
+            db.setTransactionSuccessful();
+        }
+        finally {
+            db.endTransaction();
+        }
+    }
     public static List<MobileLedgerProfile> createInitialProfileList() {
         List<MobileLedgerProfile> result = new ArrayList<>();
         MobileLedgerProfile first =
@@ -163,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();
@@ -256,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;
+    }
 }