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=168941f87fb4ed39b165d91f96edbd711d7de133;hp=bb3f20a47df588610c24dc535971da63a83e51f2;hb=ff3be47725919f5284a2a4e2348d1ab6fd561325;hpb=00a1049ca910c976363fd1c2f6304d4512cfcedb 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 bb3f20a4..168941f8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -25,6 +25,7 @@ import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.UUID; @@ -36,8 +37,16 @@ public final class MobileLedgerProfile { private boolean authEnabled; private String authUserName; private String authPassword; + private int themeId; + private int orderNo = -1; public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url, boolean authEnabled, String authUserName, String authPassword) { + this(uuid, name, permitPosting, url, authEnabled, authUserName, authPassword, -1); + + } + public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url, + boolean authEnabled, String authUserName, String authPassword, + int themeId) { this.uuid = uuid; this.name = name; this.permitPosting = permitPosting; @@ -45,10 +54,12 @@ public final class MobileLedgerProfile { this.authEnabled = authEnabled; this.authUserName = authUserName; this.authPassword = authPassword; + this.themeId = themeId; + this.orderNo = -1; } public MobileLedgerProfile(CharSequence name, boolean permitPosting, CharSequence url, boolean authEnabled, CharSequence authUserName, - CharSequence authPassword) { + CharSequence authPassword, int themeId) { this.uuid = String.valueOf(UUID.randomUUID()); this.name = String.valueOf(name); this.permitPosting = permitPosting; @@ -56,6 +67,8 @@ public final class MobileLedgerProfile { this.authEnabled = authEnabled; this.authUserName = String.valueOf(authUserName); this.authPassword = String.valueOf(authPassword); + this.themeId = themeId; + this.orderNo = -1; } // loads all profiles into Data.profiles // returns the profile with the given UUID @@ -64,14 +77,15 @@ public final class MobileLedgerProfile { List list = new ArrayList<>(); SQLiteDatabase db = MLDB.getReadableDatabase(); try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + - "auth_password, permit_posting FROM profiles order by " + - "order_no", null)) + "auth_password, permit_posting, theme, order_no FROM " + + "profiles order by order_no", null)) { while (cursor.moveToNext()) { MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0), cursor.getString(1), cursor.getInt(6) == 1, cursor.getString(2), cursor.getInt(3) == 1, - cursor.getString(4), cursor.getString(5)); + cursor.getString(4), cursor.getString(5), cursor.getInt(7)); + item.orderNo = cursor.getInt(8); list.add(item); if (item.getUuid().equals(currentProfileUUID)) result = item; } @@ -87,6 +101,7 @@ public final class MobileLedgerProfile { for (MobileLedgerProfile p : Data.profiles.getList()) { db.execSQL("update profiles set order_no=? where uuid=?", new Object[]{orderNo, p.getUuid()}); + p.orderNo = orderNo; orderNo++; } db.setTransactionSuccessful(); @@ -150,12 +165,16 @@ public final class MobileLedgerProfile { SQLiteDatabase db = MLDB.getWritableDatabase(); db.beginTransaction(); try { +// Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + +// "url=%s, permit_posting=%s, authEnabled=%s, " + +// "themeId=%d", uuid, name, url, +// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeId)); db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " + "use_authentication, auth_user, " + - "auth_password) VALUES(?, ?, ?, ?, ?, ?, ?)", + "auth_password, theme, order_no) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{uuid, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, - authEnabled ? authPassword : null + authEnabled ? authPassword : null, themeId, orderNo }); db.setTransactionSuccessful(); } @@ -163,9 +182,7 @@ public final class MobileLedgerProfile { db.endTransaction(); } } - public void storeAccount(LedgerAccount acc) { - SQLiteDatabase db = MLDB.getWritableDatabase(); - + 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 = ?", @@ -176,14 +193,12 @@ public final class MobileLedgerProfile { acc.getLevel() }); } - public void storeAccountValue(String name, String currency, Float amount) { - SQLiteDatabase db = MLDB.getWritableDatabase(); + public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) { db.execSQL("replace into account_values(profile, account, " + "currency, value, keep) values(?, ?, ?, ?, 1);", new Object[]{uuid, name, currency, amount}); } - public void storeTransaction(LedgerTransaction tr) { - SQLiteDatabase db = MLDB.getWritableDatabase(); + public void storeTransaction(SQLiteDatabase db, LedgerTransaction tr) { tr.fillDataHash(); db.execSQL("DELETE from transactions WHERE profile=? and id=?", new Object[]{uuid, tr.getId()}); @@ -283,4 +298,49 @@ public final class MobileLedgerProfile { return tr; } + public int getThemeId() { +// Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId)); + return this.themeId; + } + 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}); + + } + public void markAccountsAsNotPresent(SQLiteDatabase db) { + db.execSQL("update account_values set keep=0 where profile=?;", new String[]{uuid}); + db.execSQL("update accounts set keep=0 where profile=?;", new String[]{uuid}); + + } + public void deleteNotPresentAccounts(SQLiteDatabase db) { + db.execSQL("delete from account_values where keep=0 and profile=?", new String[]{uuid}); + db.execSQL("delete from accounts where keep=0 and profile=?", new String[]{uuid}); + } + public void markTransactionAsPresent(SQLiteDatabase db, LedgerTransaction transaction) { + db.execSQL("UPDATE transactions SET keep = 1 WHERE profile = ? and id=?", + new Object[]{uuid, transaction.getId() + }); + } + public void markTransactionsBeforeTransactionAsPresent(SQLiteDatabase db, + LedgerTransaction transaction) { + db.execSQL("UPDATE transactions SET keep=1 WHERE profile = ? and id < ?", + new Object[]{uuid, transaction.getId() + }); + + } + public void deleteNotPresentTransactions(SQLiteDatabase db) { + db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0", new String[]{uuid}); + } + public void setLastUpdateStamp() { + Log.d("db", "Updating transaction value stamp"); + Date now = new Date(); + setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); + Data.lastUpdateDate.set(now); + } }