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;
private int themeId;
private int orderNo = -1;
private FutureDates futureDates = FutureDates.None;
+ private SendTransactionTask.API apiVersion = SendTransactionTask.API.auto;
public MobileLedgerProfile() {
this.uuid = String.valueOf(UUID.randomUUID());
}
themeId = origin.themeId;
orderNo = origin.orderNo;
futureDates = origin.futureDates;
+ apiVersion = origin.apiVersion;
}
// loads all profiles into Data.profiles
// returns the profile with the given UUID
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));
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))
}
public static void storeProfilesOrder() {
SQLiteDatabase db = App.getDatabase();
- db.beginTransaction();
+ db.beginTransactionNonExclusive();
try {
int orderNo = 0;
for (MobileLedgerProfile p : Data.profiles.getValue()) {
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;
}
}
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, " +
// permitPosting ? "TRUE" : "FALSE", authEnabled ? "TRUE" : "FALSE", themeId));
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()
+ preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt()
});
db.setTransactionSuccessful();
}
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()));
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);