support both 1.14 and 1.15 JSON APIs

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / MobileLedgerProfile.java

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 a12582714c73721922bfdd69eef197d8b4ad5764..2cd159c5e7079c840e333f56da1e5c0c6eaf99a8 100644 (file)
--- 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 {
@@ -52,6 +53,7 @@ public final class MobileLedgerProfile {
     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());
     }
@@ -70,6 +72,7 @@ public final class MobileLedgerProfile {
         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
@@ -95,7 +98,9 @@ public final class MobileLedgerProfile {
                 item.setPreferredAccountsFilter(cursor.getString(9));
                 item.setFutureDates(cursor.getInt(10));
                 list.add(item);
-                if (item.getUuid().equals(currentProfileUUID)) result = item;
+                if (item.getUuid()
+                        .equals(currentProfileUUID))
+                    result = item;
             }
         }
         Data.profiles.setValue(list);
@@ -118,6 +123,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;
     }
@@ -264,11 +278,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);
@@ -335,7 +351,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;
     }
@@ -377,7 +394,8 @@ public final class MobileLedgerProfile {
         return this.themeId;
     }
     public void setThemeId(Object o) {
-        setThemeId(Integer.valueOf(String.valueOf(o)).intValue());
+        setThemeId(Integer.valueOf(String.valueOf(o))
+                          .intValue());
     }
     public void setThemeId(int themeId) {
 //        debug("profile", String.format("Profile.setThemeId(%d) called", themeId));