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=a279f34f0b45fa38a9230822f967a208a93895e4;hp=9731e3e6b4eb7689e422fc7ba697ff13b0532a7e;hb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;hpb=7165b89c8ff2b9d8f69e02354197127ec27a4a47 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 9731e3e6..a279f34f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -19,11 +19,9 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.util.Log; import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.utils.Globals; -import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; import java.util.ArrayList; @@ -34,68 +32,64 @@ import java.util.UUID; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import static net.ktnx.mobileledger.utils.Logger.debug; + public final class MobileLedgerProfile { private String uuid; private String name; private boolean permitPosting; + private String preferredAccountsFilter; private String url; 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() { + this.uuid = String.valueOf(UUID.randomUUID()); } - public MobileLedgerProfile(String uuid, String name, boolean permitPosting, String url, - boolean authEnabled, String authUserName, String authPassword, - int themeId) { + public MobileLedgerProfile(String uuid) { this.uuid = uuid; - this.name = name; - this.permitPosting = permitPosting; - this.url = url; - 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, int themeId) { - this.uuid = String.valueOf(UUID.randomUUID()); - this.name = String.valueOf(name); - this.permitPosting = permitPosting; - this.url = String.valueOf(url); - this.authEnabled = authEnabled; - this.authUserName = String.valueOf(authUserName); - this.authPassword = String.valueOf(authPassword); - this.themeId = themeId; - this.orderNo = -1; + public MobileLedgerProfile(MobileLedgerProfile origin) { + uuid = origin.uuid; + name = origin.name; + permitPosting = origin.permitPosting; + preferredAccountsFilter = origin.preferredAccountsFilter; + url = origin.url; + authEnabled = origin.authEnabled; + authUserName = origin.authUserName; + authPassword = origin.authPassword; + themeId = origin.themeId; + orderNo = origin.orderNo; } // 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<>(); + ArrayList list = new ArrayList<>(); SQLiteDatabase db = MLDB.getDatabase(); try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + - "auth_password, permit_posting, theme, order_no FROM " + + "auth_password, permit_posting, theme, order_no, " + + "preferred_accounts_filter 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.getInt(7)); + MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0)); + item.setName(cursor.getString(1)); + item.setUrl(cursor.getString(2)); + item.setAuthEnabled(cursor.getInt(3) == 1); + item.setAuthUserName(cursor.getString(4)); + item.setAuthPassword(cursor.getString(5)); + item.setPostingPermitted(cursor.getInt(6) == 1); + item.setThemeId(cursor.getInt(7)); item.orderNo = cursor.getInt(8); + item.setPreferredAccountsFilter(cursor.getString(9)); list.add(item); if (item.getUuid().equals(currentProfileUUID)) result = item; } } - Data.profiles.setList(list); + Data.profiles.setValue(list); return result; } public static void storeProfilesOrder() { @@ -103,14 +97,11 @@ public final class MobileLedgerProfile { db.beginTransaction(); try { int orderNo = 0; - try (LockHolder lh = Data.profiles.lockForReading()) { - for (int i = 0; i < Data.profiles.size(); i++) { - MobileLedgerProfile p = Data.profiles.get(i); - db.execSQL("update profiles set order_no=? where uuid=?", - new Object[]{orderNo, p.getUuid()}); - p.orderNo = orderNo; - orderNo++; - } + for (MobileLedgerProfile p : Data.profiles.getValue()) { + db.execSQL("update profiles set order_no=? where uuid=?", + new Object[]{orderNo, p.getUuid()}); + p.orderNo = orderNo; + orderNo++; } db.setTransactionSuccessful(); } @@ -118,6 +109,15 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + public String getPreferredAccountsFilter() { + return preferredAccountsFilter; + } + public void setPreferredAccountsFilter(String preferredAccountsFilter) { + this.preferredAccountsFilter = preferredAccountsFilter; + } + public void setPreferredAccountsFilter(CharSequence preferredAccountsFilter) { + setPreferredAccountsFilter(String.valueOf(preferredAccountsFilter)); + } public boolean isPostingPermitted() { return permitPosting; } @@ -173,16 +173,18 @@ public final class MobileLedgerProfile { SQLiteDatabase db = MLDB.getDatabase(); db.beginTransaction(); try { -// Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + +// debug("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, theme, order_no) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)", + "auth_password, theme, order_no, preferred_accounts_filter) " + + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{uuid, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, - authEnabled ? authPassword : null, themeId, orderNo + authEnabled ? authPassword : null, themeId, orderNo, + preferredAccountsFilter }); db.setTransactionSuccessful(); } @@ -204,7 +206,7 @@ public final class MobileLedgerProfile { new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(), acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded() }); -// Log.d("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); +// debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid)); } public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) { db.execSQL("replace into account_values(profile, account, " + @@ -231,7 +233,7 @@ public final class MobileLedgerProfile { item.getCurrency() }); } - Log.d("profile", String.format("Transaction %d stored", tr.getId())); +// debug("profile", String.format("Transaction %d stored", tr.getId())); } public String getOption(String name, String default_value) { SQLiteDatabase db = MLDB.getDatabase(); @@ -242,17 +244,17 @@ public final class MobileLedgerProfile { String result = cursor.getString(0); if (result == null) { - Log.d("profile", "returning default value for " + name); + debug("profile", "returning default value for " + name); result = default_value; } - else Log.d("profile", String.format("option %s=%s", name, result)); + else debug("profile", String.format("option %s=%s", name, result)); return result; } else return default_value; } catch (Exception e) { - Log.d("db", "returning default value for " + name, e); + debug("db", "returning default value for " + name, e); return default_value; } } @@ -260,16 +262,16 @@ public final class MobileLedgerProfile { long longResult; String result = getOption(name, ""); if ((result == null) || result.isEmpty()) { - Log.d("profile", String.format("Returning default value for option %s", name)); + debug("profile", String.format("Returning default value for option %s", name)); longResult = default_value; } else { try { longResult = Long.parseLong(result); - Log.d("profile", String.format("option %s=%s", name, result)); + debug("profile", String.format("option %s=%s", name, result)); } catch (Exception e) { - Log.d("profile", String.format("Returning default value for option %s", name), e); + debug("profile", String.format("Returning default value for option %s", name), e); longResult = default_value; } } @@ -277,7 +279,7 @@ public final class MobileLedgerProfile { return longResult; } public void setOption(String name, String value) { - Log.d("profile", String.format("setting option %s=%s", name, value)); + debug("profile", String.format("setting option %s=%s", name, value)); DbOpQueue.add("insert or replace into options(profile, name, value) values(?, ?, ?);", new String[]{uuid, name, value}); } @@ -286,14 +288,15 @@ public final class MobileLedgerProfile { } public void removeFromDB() { SQLiteDatabase db = MLDB.getDatabase(); - Log.d("db", String.format("removing profile %s from DB", uuid)); + debug("db", String.format("removing profile %s from DB", uuid)); db.beginTransaction(); try { - db.execSQL("delete from profiles where uuid=?", new Object[]{uuid}); - db.execSQL("delete from accounts where profile=?", new Object[]{uuid}); - db.execSQL("delete from account_values where profile=?", new Object[]{uuid}); - db.execSQL("delete from transactions where profile=?", new Object[]{uuid}); - db.execSQL("delete from transaction_accounts where profile=?", new Object[]{uuid}); + Object[] uuid_param = new Object[]{uuid}; + db.execSQL("delete from profiles where uuid=?", uuid_param); + db.execSQL("delete from accounts where profile=?", uuid_param); + db.execSQL("delete from account_values where profile=?", uuid_param); + db.execSQL("delete from transactions where profile=?", uuid_param); + db.execSQL("delete from transaction_accounts where profile=?", uuid_param); db.setTransactionSuccessful(); } finally { @@ -352,14 +355,14 @@ public final class MobileLedgerProfile { return tr; } public int getThemeId() { -// Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId)); +// debug("profile", String.format("Profile.getThemeId() returning %d", themeId)); return this.themeId; } public void setThemeId(Object o) { setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); } public void setThemeId(int themeId) { -// Log.d("profile", String.format("Profile.setThemeId(%d) called", themeId)); +// debug("profile", String.format("Profile.setThemeId(%d) called", themeId)); this.themeId = themeId; } public void markTransactionsAsNotPresent(SQLiteDatabase db) { @@ -391,10 +394,10 @@ public final class MobileLedgerProfile { db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0", new String[]{uuid}); } public void setLastUpdateStamp() { - Log.d("db", "Updating transaction value stamp"); + debug("db", "Updating transaction value stamp"); Date now = new Date(); setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); - Data.lastUpdateDate.set(now); + Data.lastUpdateDate.postValue(now); } public List loadChildAccountsOf(LedgerAccount acc) { List result = new ArrayList<>(); @@ -432,4 +435,20 @@ public final class MobileLedgerProfile { return result; } + public void wipeAllData() { + SQLiteDatabase db = MLDB.getDatabase(); + db.beginTransaction(); + try { + String[] pUuid = new String[]{uuid}; + db.execSQL("delete from options where profile=?", pUuid); + db.execSQL("delete from accounts where profile=?", pUuid); + db.execSQL("delete from account_values where profile=?", pUuid); + db.execSQL("delete from transactions where profile=?", pUuid); + db.execSQL("delete from transaction_accounts where profile=?", pUuid); + db.setTransactionSuccessful(); + } + finally { + db.endTransaction(); + } + } }