X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=0e8c04485262c6fa8c603408051807914557b039;hb=9fad5003ac30c3e4f9d073e04f4569aeb31779b2;hp=6f6e51cbd6e5293dca8b9e562780e1086aa3ea3a;hpb=2a15cec60bc1b58fa1b7d4359bd57fd4d8ad7c44;p=mobile-ledger.git 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 6f6e51cb..0e8c0448 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -1,5 +1,5 @@ /* - * 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 @@ -17,9 +17,12 @@ 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; @@ -28,7 +31,9 @@ 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; @@ -59,10 +64,11 @@ public final class MobileLedgerProfile { 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) { @@ -86,6 +92,8 @@ public final class MobileLedgerProfile { 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 @@ -97,7 +105,8 @@ public final class MobileLedgerProfile { "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()) { @@ -116,13 +125,28 @@ public final class MobileLedgerProfile { 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() { @@ -142,6 +166,23 @@ public final class MobileLedgerProfile { 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) { @@ -179,6 +220,8 @@ public final class MobileLedgerProfile { return false; if (apiVersion != p.apiVersion) return false; + if (!Objects.equals(detectedVersion, p.detectedVersion)) + return false; return futureDates == p.futureDates; } public boolean getShowCommentsByDefault() { @@ -205,14 +248,14 @@ public final class MobileLedgerProfile { 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; @@ -294,13 +337,18 @@ public final class MobileLedgerProfile { 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(); } @@ -593,7 +641,7 @@ public final class MobileLedgerProfile { } } - private int value; + private final int value; FutureDates(int value) { this.value = value; }