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=a75ac72aae165e02cb40e76aa17bc3c8a5a7b471;hp=6e5ac129f4da2b87c413ffa09cf03edaab9decc4;hb=1c42b2e42a6fe3fe2aaae3ad3480d924db75f4ba;hpb=dcd151c241104f520aae69c2074a6559e897b625
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 6e5ac129..a75ac72a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -1,80 +1,99 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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;
+import java.util.Date;
import java.util.List;
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;
- public MobileLedgerProfile(String uuid, String name, String url, boolean authEnabled,
- String authUserName, String authPassword) {
- this.uuid = uuid;
- this.name = name;
- this.url = url;
- this.authEnabled = authEnabled;
- this.authUserName = authUserName;
- this.authPassword = authPassword;
- }
- public MobileLedgerProfile(CharSequence name, CharSequence url, boolean authEnabled,
- CharSequence authUserName, CharSequence authPassword) {
+ private int themeId;
+ private int orderNo = -1;
+ public MobileLedgerProfile() {
this.uuid = String.valueOf(UUID.randomUUID());
- this.name = String.valueOf(name);
- this.url = String.valueOf(url);
- this.authEnabled = authEnabled;
- this.authUserName = String.valueOf(authUserName);
- this.authPassword = String.valueOf(authPassword);
}
- public static List loadAllFromDB() {
- List result = new ArrayList<>();
- SQLiteDatabase db = MLDB.getReadableDatabase();
+ public MobileLedgerProfile(String uuid) {
+ this.uuid = uuid;
+ }
+ // 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.getDatabase();
try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
- "auth_password FROM profiles order by order_no", null))
+ "auth_password, permit_posting, theme, order_no, " +
+ "preferred_accounts_filter 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));
+ 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);
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()});
- 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();
}
@@ -82,43 +101,20 @@ public final class MobileLedgerProfile {
db.endTransaction();
}
}
- 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 String getPreferredAccountsFilter() {
+ return preferredAccountsFilter;
}
- 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;
- }
- }
-
- return new MobileLedgerProfile(profileUUID, name, url, useAuthentication, authUser,
- authPassword);
+ public void setPreferredAccountsFilter(String preferredAccountsFilter) {
+ this.preferredAccountsFilter = preferredAccountsFilter;
+ }
+ public void setPreferredAccountsFilter(CharSequence preferredAccountsFilter) {
+ setPreferredAccountsFilter(String.valueOf(preferredAccountsFilter));
+ }
+ public boolean isPostingPermitted() {
+ return permitPosting;
+ }
+ public void setPostingPermitted(boolean permitPosting) {
+ this.permitPosting = permitPosting;
}
public String getUuid() {
return uuid;
@@ -166,13 +162,21 @@ public final class MobileLedgerProfile {
this.authPassword = authPassword;
}
public void storeInDB() {
- SQLiteDatabase db = MLDB.getWritableDatabase();
+ SQLiteDatabase db = MLDB.getDatabase();
db.beginTransaction();
try {
- db.execSQL("REPLACE INTO profiles(uuid, name, url, use_authentication, auth_user, " +
- "auth_password) VALUES(?, ?, ?, ?, ?, ?)",
- new Object[]{uuid, name, url, authEnabled, authEnabled ? authUserName : null,
- authEnabled ? authPassword : null
+// 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, preferred_accounts_filter) " +
+ "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ new Object[]{uuid, name, permitPosting, url, authEnabled,
+ authEnabled ? authUserName : null,
+ authEnabled ? authPassword : null, themeId, orderNo,
+ preferredAccountsFilter
});
db.setTransactionSuccessful();
}
@@ -180,27 +184,28 @@ 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 = ?",
- new Object[]{acc.getLevel(), uuid, acc.getName()});
- db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level) " +
- "select ?,?,?,?,? where (select changes() = 0)",
+ db.execSQL("update accounts set level = ?, keep = 1, hidden=?, expanded=? " +
+ "where profile=? and name = ?",
+ new Object[]{acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded(), uuid,
+ acc.getName()
+ });
+ db.execSQL(
+ "insert into accounts(profile, name, name_upper, parent_name, level, hidden, expanded, keep) " +
+ "select ?,?,?,?,?,?,?,1 where (select changes() = 0)",
new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
- acc.getLevel()
+ acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded()
});
+// debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid));
}
- 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()});
@@ -209,7 +214,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()) {
@@ -219,10 +225,10 @@ 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.getReadableDatabase();
+ SQLiteDatabase db = MLDB.getDatabase();
try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
new String[]{uuid, name}))
{
@@ -230,17 +236,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;
}
}
@@ -248,16 +254,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;
}
}
@@ -265,32 +271,176 @@ public final class MobileLedgerProfile {
return longResult;
}
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(?, ?, ?);",
+ 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});
}
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});
+ SQLiteDatabase db = MLDB.getDatabase();
+ debug("db", String.format("removing profile %s from DB", uuid));
+ db.beginTransaction();
+ try {
+ 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 {
+ db.endTransaction();
+ }
}
+ @NonNull
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}))
+ SQLiteDatabase db = MLDB.getDatabase();
+ return loadAccount(db, name);
+ }
+ @Nullable
+ public LedgerAccount tryLoadAccount(String acct_name) {
+ SQLiteDatabase db = MLDB.getDatabase();
+ return tryLoadAccount(db, acct_name);
+ }
+ @NonNull
+ public LedgerAccount loadAccount(SQLiteDatabase db, String accName) {
+ LedgerAccount acc = tryLoadAccount(db, accName);
+
+ if (acc == null) throw new RuntimeException("Unable to load account with name " + accName);
+
+ return acc;
+ }
+ @Nullable
+ public LedgerAccount tryLoadAccount(SQLiteDatabase db, String accName) {
+ try (Cursor cursor = db.rawQuery(
+ "SELECT a.hidden, a.expanded, (select 1 from accounts a2 " +
+ "where a2.profile = a.profile and a2.name like a.name||':%' limit 1) " +
+ "FROM accounts a WHERE a.profile = ? and a.name=?", new String[]{uuid, accName}))
{
if (cursor.moveToFirst()) {
- LedgerAccount acc = new LedgerAccount(name);
- acc.setHidden(cursor.getInt(0) == 1);
+ LedgerAccount acc = new LedgerAccount(accName);
+ acc.setHiddenByStar(cursor.getInt(0) == 1);
+ acc.setExpanded(cursor.getInt(1) == 1);
+ acc.setHasSubAccounts(cursor.getInt(2) == 1);
+
+ try (Cursor c2 = db.rawQuery(
+ "SELECT value, currency FROM account_values WHERE profile = ? " +
+ "AND account = ?", new String[]{uuid, accName}))
+ {
+ while (c2.moveToNext()) {
+ acc.addAmount(c2.getFloat(0), c2.getString(1));
+ }
+ }
return acc;
}
+ return null;
}
+ }
+ public LedgerTransaction loadTransaction(int transactionId) {
+ LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid);
+ tr.loadData(MLDB.getDatabase());
+
+ return tr;
+ }
+ public int getThemeId() {
+// 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) {
+// debug("profile", String.format("Profile.setThemeId(%d) called", themeId));
+ this.themeId = themeId;
+ }
+ 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()
+ });
- return null;
+ }
+ public void deleteNotPresentTransactions(SQLiteDatabase db) {
+ db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0", new String[]{uuid});
+ }
+ public void setLastUpdateStamp() {
+ debug("db", "Updating transaction value stamp");
+ Date now = new Date();
+ setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
+ Data.lastUpdateDate.postValue(now);
+ }
+ public List loadChildAccountsOf(LedgerAccount acc) {
+ List result = new ArrayList<>();
+ 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()}))
+ {
+ while (c.moveToNext()) {
+ LedgerAccount a = loadAccount(db, c.getString(0));
+ result.add(a);
+ }
+ }
+
+ return result;
+ }
+ public List loadVisibleChildAccountsOf(LedgerAccount acc) {
+ List result = new ArrayList<>();
+ ArrayList visibleList = new ArrayList<>();
+ visibleList.add(acc);
+
+ 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()}))
+ {
+ while (c.moveToNext()) {
+ LedgerAccount a = loadAccount(db, c.getString(0));
+ if (a.isVisible(visibleList)) {
+ result.add(a);
+ visibleList.add(a);
+ }
+ }
+ }
+
+ 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();
+ }
}
}