X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=5fbb5ba04c69061d7999fde0936a6215b61f4855;hb=1738aee062f23cc9a69ed11cade1cb048f083def;hp=a12582714c73721922bfdd69eef197d8b4ad5764;hpb=302e6c48325c2069a632e770a79cdef5ec2bb945;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 a1258271..5fbb5ba0 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -22,9 +22,13 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.util.SparseArray; +import androidx.annotation.NonNull; +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.utils.Globals; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; @@ -35,9 +39,6 @@ import java.util.List; import java.util.Locale; import java.util.UUID; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import static net.ktnx.mobileledger.utils.Logger.debug; public final class MobileLedgerProfile { @@ -49,9 +50,10 @@ public final class MobileLedgerProfile { private boolean authEnabled; private String authUserName; private String authPassword; - private int themeId; + private int themeHue; private int orderNo = -1; private FutureDates futureDates = FutureDates.None; + private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto; public MobileLedgerProfile() { this.uuid = String.valueOf(UUID.randomUUID()); } @@ -67,9 +69,10 @@ public final class MobileLedgerProfile { authEnabled = origin.authEnabled; authUserName = origin.authUserName; authPassword = origin.authPassword; - themeId = origin.themeId; + themeHue = origin.themeHue; orderNo = origin.orderNo; futureDates = origin.futureDates; + apiVersion = origin.apiVersion; } // loads all profiles into Data.profiles // returns the profile with the given UUID @@ -79,8 +82,8 @@ public final class MobileLedgerProfile { SQLiteDatabase db = App.getDatabase(); try (Cursor cursor = db.rawQuery("SELECT uuid, name, url, use_authentication, auth_user, " + "auth_password, permit_posting, theme, order_no, " + - "preferred_accounts_filter, future_dates FROM " + - "profiles order by order_no", null)) + "preferred_accounts_filter, future_dates, api_version " + + "FROM " + "profiles order by order_no", null)) { while (cursor.moveToNext()) { MobileLedgerProfile item = new MobileLedgerProfile(cursor.getString(0)); @@ -94,8 +97,11 @@ public final class MobileLedgerProfile { item.orderNo = cursor.getInt(8); item.setPreferredAccountsFilter(cursor.getString(9)); item.setFutureDates(cursor.getInt(10)); + item.setApiVersion(cursor.getInt(11)); list.add(item); - if (item.getUuid().equals(currentProfileUUID)) result = item; + if (item.getUuid() + .equals(currentProfileUUID)) + result = item; } } Data.profiles.setValue(list); @@ -103,7 +109,7 @@ public final class MobileLedgerProfile { } public static void storeProfilesOrder() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { int orderNo = 0; for (MobileLedgerProfile p : Data.profiles.getValue()) { @@ -118,6 +124,15 @@ public final class MobileLedgerProfile { db.endTransaction(); } } + public SendTransactionTask.API getApiVersion() { + return apiVersion; + } + public void setApiVersion(SendTransactionTask.API apiVersion) { + this.apiVersion = apiVersion; + } + public void setApiVersion(int apiVersion) { + this.apiVersion = SendTransactionTask.API.valueOf(apiVersion); + } public FutureDates getFutureDates() { return futureDates; } @@ -189,20 +204,20 @@ public final class MobileLedgerProfile { } public void storeInDB() { SQLiteDatabase db = App.getDatabase(); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { // 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)); +// "themeHue=%d", uuid, name, url, +// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeHue)); db.execSQL("REPLACE INTO profiles(uuid, name, permit_posting, url, " + "use_authentication, auth_user, " + - "auth_password, theme, order_no, preferred_accounts_filter, future_dates) " + - "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", + "auth_password, theme, order_no, preferred_accounts_filter, future_dates, " + + "api_version) " + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new Object[]{uuid, name, permitPosting, url, authEnabled, authEnabled ? authUserName : null, - authEnabled ? authPassword : null, themeId, orderNo, - preferredAccountsFilter, futureDates.toInt() + authEnabled ? authPassword : null, themeHue, orderNo, + preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt() }); db.setTransactionSuccessful(); } @@ -245,9 +260,9 @@ public final class MobileLedgerProfile { for (LedgerTransactionAccount item : tr.getAccounts()) { db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " + - "account_name, amount, currency) values(?, ?, ?, ?, ?)", + "account_name, amount, currency, comment) values(?, ?, ?, ?, ?, ?)", new Object[]{uuid, tr.getId(), item.getAccountName(), item.getAmount(), - item.getCurrency() + item.getCurrency(), item.getComment() }); } // debug("profile", String.format("Transaction %d stored", tr.getId())); @@ -264,11 +279,13 @@ public final class MobileLedgerProfile { debug("profile", "returning default value for " + name); result = default_value; } - else debug("profile", String.format("option %s=%s", name, result)); + else + debug("profile", String.format("option %s=%s", name, result)); return result; } - else return default_value; + else + return default_value; } catch (Exception e) { debug("db", "returning default value for " + name, e); @@ -306,7 +323,7 @@ public final class MobileLedgerProfile { public void removeFromDB() { SQLiteDatabase db = App.getDatabase(); debug("db", String.format("removing profile %s from DB", uuid)); - db.beginTransaction(); + db.beginTransactionNonExclusive(); try { Object[] uuid_param = new Object[]{uuid}; db.execSQL("delete from profiles where uuid=?", uuid_param); @@ -335,7 +352,8 @@ public final class MobileLedgerProfile { 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); + if (acc == null) + throw new RuntimeException("Unable to load account with name " + accName); return acc; } @@ -372,16 +390,16 @@ public final class MobileLedgerProfile { return tr; } - public int getThemeId() { -// debug("profile", String.format("Profile.getThemeId() returning %d", themeId)); - return this.themeId; + public int getThemeHue() { +// debug("profile", String.format("Profile.getThemeHue() returning %d", themeHue)); + return this.themeHue; } - public void setThemeId(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); + public void setThemeHue(Object o) { + setThemeId(Integer.valueOf(String.valueOf(o))); } - public void setThemeId(int themeId) { -// debug("profile", String.format("Profile.setThemeId(%d) called", themeId)); - this.themeId = themeId; + public void setThemeId(int themeHue) { +// debug("profile", String.format("Profile.setThemeHue(%d) called", themeHue)); + this.themeHue = themeHue; } public void markTransactionsAsNotPresent(SQLiteDatabase db) { db.execSQL("UPDATE transactions set keep=0 where profile=?", new String[]{uuid});