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;
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 {
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());
}
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
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)) result = item;
+ if (item.getUuid()
+ .equals(currentProfileUUID))
+ result = item;
}
}
Data.profiles.setValue(list);
}
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, " +
-// "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();
}
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()));
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);
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);
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;
}
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});
projects / mobile-ledger.git / blobdiff