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=6c7fb195719bb97ea7b5e6c2fc1dac03adb8ef34;hp=72097a3faa6112e89475fb95b1601a394be1ab68;hb=663f1b268de18b7d10a305e4f955d04e87d4a8a1;hpb=3b365016042215dd73cb4600840aa8199b8322b9 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 72097a3f..6c7fb195 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -21,6 +21,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.util.Log; +import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; @@ -52,78 +53,65 @@ public final class MobileLedgerProfile { this.authUserName = String.valueOf(authUserName); this.authPassword = String.valueOf(authPassword); } - public static List loadAllFromDB() { - List result = new ArrayList<>(); + // loads all profiles into Data.profiles + // returns the profile with the given UUID + public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) { + MobileLedgerProfile result = null; + List list = 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), - cursor.getString(5))); + MobileLedgerProfile item = + new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), + cursor.getString(2), cursor.getInt(3) == 1, cursor.getString(4), + cursor.getString(5)); + list.add(item); + if (item.getUuid().equals(currentProfileUUID)) result = item; } } + Data.profiles.setList(list); return result; } - public static List createInitialProfileList() { - List result = new ArrayList<>(); - MobileLedgerProfile first = - new MobileLedgerProfile(UUID.randomUUID().toString(), "default", "", false, "", ""); - first.storeInDB(); - result.add(first); - - return result; - } - public static MobileLedgerProfile loadUUIDFromDB(String profileUUID) { - SQLiteDatabase db = MLDB.getReadableDatabase(); - String name; - String url; - String authUser; - String authPassword; - Boolean useAuthentication; - try (Cursor cursor = db.rawQuery("SELECT name, url, use_authentication, auth_user, " + - "auth_password FROM profiles WHERE uuid=?", - new String[]{profileUUID})) - { - if (cursor.moveToNext()) { - name = cursor.getString(0); - url = cursor.getString(1); - useAuthentication = cursor.getInt(2) == 1; - authUser = useAuthentication ? cursor.getString(3) : null; - authPassword = useAuthentication ? cursor.getString(4) : null; - } - else { - name = "Unknown profile"; - url = "Https://server/url"; - useAuthentication = false; - authUser = authPassword = null; + 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(); } - - return new MobileLedgerProfile(profileUUID, name, url, useAuthentication, authUser, - authPassword); } + public String getUuid() { return uuid; } public String getName() { return name; } - public void setName(CharSequence text) { - setName(String.valueOf(text)); - } public void setName(String name) { this.name = name; } + public void setName(CharSequence text) { + setName(String.valueOf(text)); + } public String getUrl() { return url; } - public void setUrl(CharSequence text) { - setUrl(String.valueOf(text)); - } public void setUrl(String url) { this.url = url; } + public void setUrl(CharSequence text) { + setUrl(String.valueOf(text)); + } public boolean isAuthEnabled() { return authEnabled; } @@ -133,21 +121,21 @@ public final class MobileLedgerProfile { public String getAuthUserName() { return authUserName; } - public void setAuthUserName(CharSequence text) { - setAuthUserName(String.valueOf(text)); - } public void setAuthUserName(String authUserName) { this.authUserName = authUserName; } + public void setAuthUserName(CharSequence text) { + setAuthUserName(String.valueOf(text)); + } public String getAuthPassword() { return authPassword; } - public void setAuthPassword(CharSequence text) { - setAuthPassword(String.valueOf(text)); - } public void setAuthPassword(String authPassword) { this.authPassword = authPassword; } + public void setAuthPassword(CharSequence text) { + setAuthPassword(String.valueOf(text)); + } public void storeInDB() { SQLiteDatabase db = MLDB.getWritableDatabase(); db.beginTransaction(); @@ -163,16 +151,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(); @@ -190,7 +180,8 @@ public final class MobileLedgerProfile { db.execSQL("INSERT INTO transactions(profile, id, date, description, data_hash, keep) " + "values(?,?,?,?,?,1)", - new Object[]{uuid, tr.getId(), tr.getDate(), tr.getDescription(), tr.getDataHash() + new Object[]{uuid, tr.getId(), Globals.formatLedgerDate(tr.getDate()), + tr.getDescription(), tr.getDataHash() }); for (LedgerTransactionAccount item : tr.getAccounts()) { @@ -202,7 +193,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})) @@ -225,9 +216,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; @@ -245,13 +236,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; } }