/*
- * 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;
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) {
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
"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()) {
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))
result = item;
}
}
- Data.profiles.setValue(list);
+ Data.profiles.postValue(list);
return result;
}
public static void storeProfilesOrder() {
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;
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;
db.execSQL("REPLACE INTO profiles(uuid, 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(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ "show_commodity_by_default, default_commodity, show_comments_by_default," +
+ "detected_version_pre_1_19, detected_version_major, " +
+ "detected_version_minor) " +
+ "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
new Object[]{uuid, 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();
}
}
public void storeAccountValue(SQLiteDatabase db, int generation, String name, String currency,
Float amount) {
+ 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()
+ });
+ }
+ }
+
db.execSQL("replace into account_values(profile, account, " +
"currency, value, generation) values(?, ?, ?, ?, ?);",
new Object[]{uuid, name, Misc.emptyIsNull(currency), amount, generation});
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 transactions where profile=?", uuid_param);
+ db.execSQL("delete from account_values where profile=?", uuid_param);
+ db.execSQL("delete from accounts where profile=?", uuid_param);
db.execSQL("delete from options where profile=?", uuid_param);
+ db.execSQL("delete from profiles where uuid=?", uuid_param);
db.setTransactionSuccessful();
}
finally {
{
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;
}
}
}
- private int value;
+ private final int value;
FutureDates(int value) {
this.value = value;
}
projects / mobile-ledger.git / blobdiff