/*
- * Copyright © 2020 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
* 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
package net.ktnx.mobileledger.model;
+import android.content.Context;
+import android.content.Intent;
import android.content.res.Resources;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.text.TextUtils;
import android.util.SparseArray;
import androidx.annotation.Nullable;
import net.ktnx.mobileledger.App;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.DbOpQueue;
-import net.ktnx.mobileledger.async.SendTransactionTask;
+import net.ktnx.mobileledger.json.API;
+import net.ktnx.mobileledger.ui.profiles.ProfileDetailActivity;
+import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment;
import net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.Misc;
import net.ktnx.mobileledger.utils.SimpleDate;
public final class MobileLedgerProfile {
// N.B. when adding new fields, update the copy-constructor below
- private final String uuid;
+ private final long id;
private String name;
private boolean permitPosting;
private boolean showCommentsByDefault;
private String authPassword;
private int themeHue;
private int orderNo = -1;
- private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto;
+ private API apiVersion = API.auto;
private FutureDates futureDates = FutureDates.None;
private boolean accountsLoaded;
private boolean transactionsLoaded;
+ private HledgerVersion detectedVersion;
// N.B. when adding new fields, update the copy-constructor below
transient private AccountAndTransactionListSaver accountAndTransactionListSaver;
- public MobileLedgerProfile(String uuid) {
- this.uuid = uuid;
+ public MobileLedgerProfile(long id) {
+ this.id = id;
}
public MobileLedgerProfile(MobileLedgerProfile origin) {
- uuid = origin.uuid;
+ id = origin.id;
name = origin.name;
permitPosting = origin.permitPosting;
showCommentsByDefault = origin.showCommentsByDefault;
defaultCommodity = origin.defaultCommodity;
accountsLoaded = origin.accountsLoaded;
transactionsLoaded = origin.transactionsLoaded;
+ if (origin.detectedVersion != null)
+ detectedVersion = new HledgerVersion(origin.detectedVersion);
}
// loads all profiles into Data.profiles
// returns the profile with the given UUID
- public static MobileLedgerProfile loadAllFromDB(@Nullable String currentProfileUUID) {
+ public static MobileLedgerProfile loadAllFromDB(long currentProfileId) {
MobileLedgerProfile result = null;
ArrayList<MobileLedgerProfile> list = new ArrayList<>();
SQLiteDatabase db = App.getDatabase();
- try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " +
+ try (Cursor cursor = db.rawQuery("SELECT id, name, url, use_authentication, auth_user, " +
"auth_password, permit_posting, theme, order_no, " +
"preferred_accounts_filter, future_dates, api_version, " +
"show_commodity_by_default, default_commodity, " +
- "show_comments_by_default FROM " +
+ "show_comments_by_default, detected_version_pre_1_19, " +
+ "detected_version_major, detected_version_minor FROM " +
"profiles order by order_no", null))
{
while (cursor.moveToNext()) {
- MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0));
+ MobileLedgerProfile item = new MobileLedgerProfile(cursor.getLong(0));
item.setName(cursor.getString(1));
item.setUrl(cursor.getString(2));
item.setAuthEnabled(cursor.getInt(3) == 1);
item.setShowCommodityByDefault(cursor.getInt(12) == 1);
item.setDefaultCommodity(cursor.getString(13));
item.setShowCommentsByDefault(cursor.getInt(14) == 1);
+ {
+ boolean pre_1_20 = cursor.getInt(15) == 1;
+ int major = cursor.getInt(16);
+ int minor = cursor.getInt(17);
+
+ if (!pre_1_20 && major == 0 && minor == 0) {
+ item.detectedVersion = null;
+ }
+ else if (pre_1_20) {
+ item.detectedVersion = new HledgerVersion(true);
+ }
+ else {
+ item.detectedVersion = new HledgerVersion(major, minor);
+ }
+ }
list.add(item);
- if (item.getUuid()
- .equals(currentProfileUUID))
+ if (item.getId() == currentProfileId)
result = item;
}
}
- Data.profiles.setValue(list);
+ Data.profiles.postValue(list);
return result;
}
public static void storeProfilesOrder() {
int orderNo = 0;
for (MobileLedgerProfile p : Objects.requireNonNull(Data.profiles.getValue())) {
db.execSQL("update profiles set order_no=? where uuid=?",
- new Object[]{orderNo, p.getUuid()});
+ new Object[]{orderNo, p.getId()});
p.orderNo = orderNo;
orderNo++;
}
db.endTransaction();
}
}
+ static public void startEditProfileActivity(Context context, MobileLedgerProfile profile) {
+ Intent intent = new Intent(context, ProfileDetailActivity.class);
+ Bundle args = new Bundle();
+ if (profile != null) {
+ int index = Data.getProfileIndex(profile);
+ if (index != -1)
+ intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
+ }
+ intent.putExtras(args);
+ context.startActivity(intent, args);
+ }
+ public HledgerVersion getDetectedVersion() {
+ return detectedVersion;
+ }
+ public void setDetectedVersion(HledgerVersion detectedVersion) {
+ this.detectedVersion = detectedVersion;
+ }
@Contract(value = "null -> false", pure = true)
@Override
public boolean equals(@Nullable Object obj) {
return false;
MobileLedgerProfile p = (MobileLedgerProfile) obj;
- if (!uuid.equals(p.uuid))
+ if (id != p.id)
return false;
if (!name.equals(p.name))
return false;
return false;
if (apiVersion != p.apiVersion)
return false;
+ if (!Objects.equals(detectedVersion, p.detectedVersion))
+ return false;
return futureDates == p.futureDates;
}
public boolean getShowCommentsByDefault() {
else
this.defaultCommodity = String.valueOf(defaultCommodity);
}
- public SendTransactionTask.API getApiVersion() {
+ public API getApiVersion() {
return apiVersion;
}
- public void setApiVersion(SendTransactionTask.API apiVersion) {
+ public void setApiVersion(API apiVersion) {
this.apiVersion = apiVersion;
}
public void setApiVersion(int apiVersion) {
- this.apiVersion = SendTransactionTask.API.valueOf(apiVersion);
+ this.apiVersion = API.valueOf(apiVersion);
}
public FutureDates getFutureDates() {
return futureDates;
public void setPostingPermitted(boolean permitPosting) {
this.permitPosting = permitPosting;
}
- public String getUuid() {
- return uuid;
+ public long getId() {
+ return id;
}
public String getName() {
return name;
// "url=%s, permit_posting=%s, authEnabled=%s, " +
// "themeHue=%d", uuid, name, url,
// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeHue));
- db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " +
+ db.execSQL("REPLACE INTO profiles(id, name, permit_posting, url, " +
"use_authentication, auth_user, auth_password, theme, order_no, " +
"preferred_accounts_filter, future_dates, api_version, " +
- "show_commodity_by_default, default_commodity, show_comments_by_default) " +
- "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- new Object[]{uuid, name, permitPosting, url, authEnabled,
+ "show_commodity_by_default, default_commodity, show_comments_by_default," +
+ "detected_version_pre_1_19, detected_version_major, " +
+ "detected_version_minor) " +
+ "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ new Object[]{id, name, permitPosting, url, authEnabled,
authEnabled ? authUserName : null,
authEnabled ? authPassword : null, themeHue, orderNo,
preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(),
- showCommodityByDefault, defaultCommodity, showCommentsByDefault
+ showCommodityByDefault, defaultCommodity, showCommentsByDefault,
+ (detectedVersion != null) && detectedVersion.isPre_1_20_1(),
+ (detectedVersion == null) ? 0 : detectedVersion.getMajor(),
+ (detectedVersion == null) ? 0 : detectedVersion.getMinor()
});
db.setTransactionSuccessful();
}
sql += ", expanded=?";
params.add(acc.isExpanded() ? 1 : 0);
}
- sql += " where profile=? and name=?";
- params.add(uuid);
+ sql += " where profile_id=? and name=?";
+ params.add(id);
params.add(acc.getName());
db.execSQL(sql, params.toArray());
- db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level, " +
+ db.execSQL("insert into accounts(profile_id, name, name_upper, parent_name, level, " +
"expanded, generation) select ?,?,?,?,?,0,? where (select changes() = 0)",
- new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
+ new Object[]{id, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
acc.getLevel(), generation
});
// debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid));
}
public void storeAccountValue(SQLiteDatabase db, int generation, String name, String currency,
Float amount) {
- db.execSQL("replace into account_values(profile, account, " +
- "currency, value, generation) values(?, ?, ?, ?, ?);",
- new Object[]{uuid, name, Misc.emptyIsNull(currency), amount, generation});
+ if (!TextUtils.isEmpty(currency)) {
+ boolean exists;
+ try (Cursor c = db.rawQuery("select 1 from currencies where name=?",
+ new String[]{currency}))
+ {
+ exists = c.moveToFirst();
+ }
+ if (!exists) {
+ db.execSQL(
+ "insert into currencies(id, name, position, has_gap) values((select max" +
+ "(id) from currencies)+1, ?, ?, ?)", new Object[]{currency,
+ Objects.requireNonNull(
+ Data.currencySymbolPosition.getValue()).toString(),
+ Data.currencyGap.getValue()
+ });
+ }
+ }
+
+ long accId = findAddAccount(db, name);
+
+ db.execSQL("replace into account_values(account_id, " +
+ "currency, value, generation) values(?, ?, ?, ?);",
+ new Object[]{accId, Misc.emptyIsNull(currency), amount, generation});
+ }
+ private long findAddAccount(SQLiteDatabase db, String accountName) {
+ try (Cursor c = db.rawQuery("select id from accounts where profile_id=? and name=?",
+ new String[]{String.valueOf(id), accountName}))
+ {
+ if (c.moveToFirst())
+ return c.getLong(0);
+
+ }
+
+ try (Cursor c = db.rawQuery(
+ "insert into accounts(profile_id, name, name_upper) values(?, ?, ?) returning id",
+ new String[]{String.valueOf(id), accountName, accountName.toUpperCase()}))
+ {
+ c.moveToFirst();
+ return c.getInt(0);
+ }
}
public void storeTransaction(SQLiteDatabase db, int generation, LedgerTransaction tr) {
tr.fillDataHash();
// Logger.debug("storeTransaction", String.format(Locale.US, "ID %d", tr.getId()));
SimpleDate d = tr.getDate();
db.execSQL("UPDATE transactions SET year=?, month=?, day=?, description=?, comment=?, " +
- "data_hash=?, generation=? WHERE profile=? AND id=?",
+ "data_hash=?, generation=? WHERE profile_id=? AND ledger_id=?",
new Object[]{d.year, d.month, d.day, tr.getDescription(), tr.getComment(),
- tr.getDataHash(), generation, uuid, tr.getId()
+ tr.getDataHash(), generation, id, tr.getId()
});
- db.execSQL("INSERT INTO transactions(profile, id, year, month, day, description, " +
- "comment, data_hash, generation) " +
- "select ?,?,?,?,?,?,?,?,? WHERE (select changes() = 0)",
- new Object[]{uuid, tr.getId(), tr.getDate().year, tr.getDate().month,
+ db.execSQL(
+ "INSERT INTO transactions(profile_id, ledger_id, year, month, day, description, " +
+ "comment, data_hash, generation) " +
+ "select ?,?,?,?,?,?,?,?,? WHERE (select changes() = 0)",
+ new Object[]{id, tr.getId(), tr.getDate().year, tr.getDate().month,
tr.getDate().day, tr.getDescription(), tr.getComment(),
tr.getDataHash(), generation
});
int accountOrderNo = 1;
for (LedgerTransactionAccount item : tr.getAccounts()) {
db.execSQL("UPDATE transaction_accounts SET account_name=?, amount=?, currency=?, " +
- "comment=?, generation=? " +
- "WHERE profile=? AND transaction_id=? AND order_no=?",
+ "comment=?, generation=? " + "WHERE transaction_id=? AND order_no=?",
new Object[]{item.getAccountName(), item.getAmount(),
Misc.nullIsEmpty(item.getCurrency()), item.getComment(),
- generation, uuid, tr.getId(), accountOrderNo
+ generation, tr.getId(), accountOrderNo
});
- db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " +
+ db.execSQL("INSERT INTO transaction_accounts(transaction_id, " +
"order_no, account_name, amount, currency, comment, generation) " +
- "select ?, ?, ?, ?, ?, ?, ?, ? WHERE (select changes() = 0)",
- new Object[]{uuid, tr.getId(), accountOrderNo, item.getAccountName(),
+ "select ?, ?, ?, ?, ?, ?, ? WHERE (select changes() = 0)",
+ new Object[]{tr.getId(), accountOrderNo, item.getAccountName(),
item.getAmount(), Misc.nullIsEmpty(item.getCurrency()),
item.getComment(), generation
});
}
public String getOption(String name, String default_value) {
SQLiteDatabase db = App.getDatabase();
- try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
- new String[]{uuid, name}))
+ try (Cursor cursor = db.rawQuery(
+ "select value from options where profile_id = ? and name=?",
+ new String[]{String.valueOf(id), name}))
{
if (cursor.moveToFirst()) {
String result = cursor.getString(0);
}
public void setOption(String name, String 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});
+ DbOpQueue.add("insert or replace into options(profile_id, name, value) values(?, ?, ?);",
+ new String[]{String.valueOf(id), name, value});
}
public void setLongOption(String name, long value) {
setOption(name, String.valueOf(value));
}
public void removeFromDB() {
SQLiteDatabase db = App.getDatabase();
- debug("db", String.format("removing profile %s from DB", uuid));
+ debug("db", String.format(Locale.ROOT, "removing profile %d from DB", id));
db.beginTransactionNonExclusive();
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.execSQL("delete from options where profile=?", uuid_param);
+ Object[] id_param = new Object[]{id};
+ db.execSQL("delete from transactions where profile_id=?", id_param);
+ db.execSQL("delete from accounts where profile=?", id_param);
+ db.execSQL("delete from options where profile=?", id_param);
+ db.execSQL("delete from profiles where id=?", id_param);
db.setTransactionSuccessful();
}
finally {
}
}
public LedgerTransaction loadTransaction(int transactionId) {
- LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid);
+ LedgerTransaction tr = new LedgerTransaction(transactionId, this.id);
tr.loadData(App.getDatabase());
return tr;
this.themeHue = themeHue;
}
public int getNextTransactionsGeneration(SQLiteDatabase db) {
- int generation = 1;
- try (Cursor c = db.rawQuery("SELECT generation FROM transactions WHERE profile=? LIMIT 1",
- new String[]{uuid}))
+ try (Cursor c = db.rawQuery(
+ "SELECT generation FROM transactions WHERE profile_id=? LIMIT 1",
+ new String[]{String.valueOf(id)}))
{
- if (c.moveToFirst()) {
- generation = c.getInt(0) + 1;
- }
+ if (c.moveToFirst())
+ return c.getInt(0) + 1;
}
- return generation;
+ return 1;
}
private int getNextAccountsGeneration(SQLiteDatabase db) {
- int generation = 1;
- try (Cursor c = db.rawQuery("SELECT generation FROM accounts WHERE profile=? LIMIT 1",
- new String[]{uuid}))
- {
- if (c.moveToFirst()) {
- generation = c.getInt(0) + 1;
- }
+ try (Cursor c = db.rawQuery("SELECT generation FROM accounts WHERE profile_id=? LIMIT 1",
+ new String[]{String.valueOf(id)})) {
+ if (c.moveToFirst())
+ return c.getInt(0) + 1;
}
- return generation;
+ return 1;
}
private void deleteNotPresentAccounts(SQLiteDatabase db, int generation) {
Logger.debug("db/benchmark", "Deleting obsolete accounts");
db.execSQL("DELETE FROM account_values WHERE profile=? AND generation <> ?",
- new Object[]{uuid, generation});
+ new Object[]{id, generation});
db.execSQL("DELETE FROM accounts WHERE profile=? AND generation <> ?",
- new Object[]{uuid, generation});
+ new Object[]{id, generation});
Logger.debug("db/benchmark", "Done deleting obsolete accounts");
}
private void deleteNotPresentTransactions(SQLiteDatabase db, int generation) {
Logger.debug("db/benchmark", "Deleting obsolete transactions");
db.execSQL("DELETE FROM transaction_accounts WHERE profile=? AND generation <> ?",
- new Object[]{uuid, generation});
+ new Object[]{id, generation});
db.execSQL("DELETE FROM transactions WHERE profile=? AND generation <> ?",
- new Object[]{uuid, generation});
+ new Object[]{id, generation});
Logger.debug("db/benchmark", "Done deleting obsolete transactions");
}
public void wipeAllData() {
SQLiteDatabase db = App.getDatabase();
db.beginTransaction();
try {
- String[] pUuid = new String[]{uuid};
+ String[] pUuid = new String[]{String.valueOf(id)};
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);
{
while (c.moveToNext()) {
Currency currency = new Currency(c.getInt(0), c.getString(1),
- Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1);
+ Currency.Position.valueOf(c.getString(2)), c.getInt(3) == 1);
result.add(currency);
}
}
{
if (cursor.moveToFirst()) {
return new Currency(cursor.getInt(0), cursor.getString(1),
- Currency.Position.valueOf(cursor.getInt(2)), cursor.getInt(3) == 1);
+ Currency.Position.valueOf(cursor.getString(2)), cursor.getInt(3) == 1);
}
return null;
}
new AccountAndTransactionListSaver(this, accounts, transactions);
accountAndTransactionListSaver.start();
}
+ private Currency tryLoadCurrencyById(SQLiteDatabase db, int id) {
+ try (Cursor cursor = db.rawQuery(
+ "SELECT c.id, c.name, c.position, c.has_gap FROM currencies c WHERE c.id=?",
+ new String[]{String.valueOf(id)}))
+ {
+ if (cursor.moveToFirst()) {
+ return new Currency(cursor.getInt(0), cursor.getString(1),
+ Currency.Position.valueOf(cursor.getString(2)), cursor.getInt(3) == 1);
+ }
+ return null;
+ }
+ }
+ public Currency loadCurrencyById(int id) {
+ SQLiteDatabase db = App.getDatabase();
+ Currency result = tryLoadCurrencyById(db, id);
+ if (result == null)
+ throw new RuntimeException(String.format("Unable to load currency with id '%d'", id));
+ return result;
+ }
public enum FutureDates {
None(0), OneWeek(7), TwoWeeks(14), OneMonth(30), TwoMonths(60), ThreeMonths(90),
}
}
- private int value;
+ private final int value;
FutureDates(int value) {
this.value = value;
}
projects / mobile-ledger.git / blobdiff