X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=53896db045391996dd6d3d0d526dc343530cc435;hb=7ae5407090d9ffe2026775ba9e569014f879b54d;hp=2cd159c5e7079c840e333f56da1e5c0c6eaf99a8;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;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 2cd159c5..53896db0 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -82,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));
@@ -97,6 +97,7 @@ 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))
@@ -108,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()) {
@@ -203,7 +204,7 @@ 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, " +
@@ -211,12 +212,12 @@ public final class MobileLedgerProfile {
 //                    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();
         }
@@ -322,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);