X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=a3157cd83c9b9418aaf850a6fa4061a55e87b6a3;hb=bb789332571609eeb1bef6e39b7ad359227d1045;hp=55746dddd1279f803798357fd4441190ea5f9452;hpb=667ce42731c95a98926657fea359b56209f9348e;p=mobile-ledger-staging.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 55746ddd..a3157cd8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -28,7 +28,7 @@ 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.utils.Logger; import net.ktnx.mobileledger.utils.Misc; import net.ktnx.mobileledger.utils.SimpleDate; @@ -59,7 +59,7 @@ 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; @@ -232,14 +232,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; @@ -330,7 +330,7 @@ public final class MobileLedgerProfile { authEnabled ? authPassword : null, themeHue, orderNo, preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt(), showCommodityByDefault, defaultCommodity, showCommentsByDefault, - (detectedVersion != null) && detectedVersion.isPre_1_20(), + (detectedVersion != null) && detectedVersion.isPre_1_20_1(), (detectedVersion == null) ? 0 : detectedVersion.getMajor(), (detectedVersion == null) ? 0 : detectedVersion.getMinor() }); @@ -625,7 +625,7 @@ public final class MobileLedgerProfile { } } - private int value; + private final int value; FutureDates(int value) { this.value = value; }