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=93a954f0a674bc95354eeb70d6c00831293f487b;hp=08a26f9d7c3b79b1358fd7114031578c71a2dbc1;hb=cd2ce61529771ef3054e4fa501ce64fcff9fa818;hpb=eb3032b39876f257361d13f290348348d99f0ee5 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 08a26f9d..93a954f0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -21,7 +21,9 @@ 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; @@ -36,59 +38,41 @@ 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; } // 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(); + 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; } @@ -97,15 +81,18 @@ public final class MobileLedgerProfile { return result; } public static void storeProfilesOrder() { - SQLiteDatabase db = MLDB.getWritableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); 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()}); - p.orderNo = orderNo; - orderNo++; + 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++; + } } db.setTransactionSuccessful(); } @@ -113,6 +100,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; } @@ -125,21 +121,21 @@ public final class MobileLedgerProfile { public String getName() { return name; } - public void setName(String name) { - this.name = name; - } public void setName(CharSequence text) { setName(String.valueOf(text)); } + public void setName(String name) { + this.name = name; + } public String getUrl() { return url; } - public void setUrl(String url) { - this.url = url; - } public void setUrl(CharSequence text) { setUrl(String.valueOf(text)); } + public void setUrl(String url) { + this.url = url; + } public boolean isAuthEnabled() { return authEnabled; } @@ -149,23 +145,23 @@ public final class MobileLedgerProfile { public String getAuthUserName() { return authUserName; } - public void setAuthUserName(String authUserName) { - this.authUserName = authUserName; - } public void setAuthUserName(CharSequence text) { setAuthUserName(String.valueOf(text)); } + public void setAuthUserName(String authUserName) { + this.authUserName = authUserName; + } public String getAuthPassword() { return authPassword; } - public void setAuthPassword(String authPassword) { - this.authPassword = authPassword; - } public void setAuthPassword(CharSequence text) { setAuthPassword(String.valueOf(text)); } + public void setAuthPassword(String authPassword) { + this.authPassword = authPassword; + } public void storeInDB() { - SQLiteDatabase db = MLDB.getWritableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); db.beginTransaction(); try { // Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " + @@ -174,10 +170,12 @@ public final class MobileLedgerProfile { // 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(); } @@ -229,7 +227,7 @@ public final class MobileLedgerProfile { Log.d("profile", String.format("Transaction %d stored", tr.getId())); } public String getOption(String name, String default_value) { - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", new String[]{uuid, name})) { @@ -273,23 +271,23 @@ public final class MobileLedgerProfile { } 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(?, ?, ?);", + DbOpQueue.add("insert or replace into options(profile, name, value) values(?, ?, ?);", new String[]{uuid, name, value}); } public void setLongOption(String name, long value) { setOption(name, String.valueOf(value)); } public void removeFromDB() { - SQLiteDatabase db = MLDB.getWritableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); Log.d("db", String.format("removing profile %s from DB", uuid)); + db.beginTransaction(); try { - db.beginTransaction(); - 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 { @@ -298,13 +296,13 @@ public final class MobileLedgerProfile { } @NonNull public LedgerAccount loadAccount(String name) { - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); return loadAccount(db, name); } @Nullable public LedgerAccount tryLoadAccount(String acct_name) { - SQLiteDatabase db = MLDB.getReadableDatabase(); - return loadAccount(acct_name); + SQLiteDatabase db = MLDB.getDatabase(); + return tryLoadAccount(db, acct_name); } @NonNull public LedgerAccount loadAccount(SQLiteDatabase db, String accName) { @@ -343,7 +341,7 @@ public final class MobileLedgerProfile { } public LedgerTransaction loadTransaction(int transactionId) { LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid); - tr.loadData(MLDB.getReadableDatabase()); + tr.loadData(MLDB.getDatabase()); return tr; } @@ -351,13 +349,13 @@ public final class MobileLedgerProfile { // Log.d("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)); 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}); @@ -394,7 +392,7 @@ public final class MobileLedgerProfile { } public List loadChildAccountsOf(LedgerAccount acc) { List result = new ArrayList<>(); - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); try (Cursor c = db.rawQuery( "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", new String[]{uuid, acc.getName()})) @@ -412,7 +410,7 @@ public final class MobileLedgerProfile { ArrayList visibleList = new ArrayList<>(); visibleList.add(acc); - SQLiteDatabase db = MLDB.getReadableDatabase(); + SQLiteDatabase db = MLDB.getDatabase(); try (Cursor c = db.rawQuery( "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'", new String[]{uuid, acc.getName()})) @@ -428,4 +426,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(); + } + } }