X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=7cadf8eb06f2d6154203fcafe0a06c36559e5d41;hb=4963aa3f9e2694c7b8a0fd45d872821aebb4273e;hp=347e1142408e22ff99c71902938846140dd26722;hpb=592803265bf5a0f6ea2da27dd061c9829ce2bf20;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 347e1142..7cadf8eb 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -32,6 +32,7 @@ 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 net.ktnx.mobileledger.utils.Misc;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -50,7 +51,7 @@ 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;
@@ -69,7 +70,7 @@ 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;
@@ -208,15 +209,15 @@ public final class MobileLedgerProfile {
         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, " +
                        "api_version) " + "VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                     new Object[]{uuid, name, permitPosting, url, authEnabled,
                                  authEnabled ? authUserName : null,
-                                 authEnabled ? authPassword : null, themeId, orderNo,
+                                 authEnabled ? authPassword : null, themeHue, orderNo,
                                  preferredAccountsFilter, futureDates.toInt(), apiVersion.toInt()
                     });
             db.setTransactionSuccessful();
@@ -243,7 +244,7 @@ public final class MobileLedgerProfile {
     public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) {
         db.execSQL("replace into account_values(profile, account, " +
                    "currency, value, keep) values(?, ?, ?, ?, 1);",
-                new Object[]{uuid, name, currency, amount});
+                new Object[]{uuid, name, Misc.emptyIsNull(currency), amount});
     }
     public void storeTransaction(SQLiteDatabase db, LedgerTransaction tr) {
         tr.fillDataHash();
@@ -262,7 +263,7 @@ public final class MobileLedgerProfile {
             db.execSQL("INSERT INTO transaction_accounts(profile, transaction_id, " +
                        "account_name, amount, currency, comment) values(?, ?, ?, ?, ?, ?)",
                     new Object[]{uuid, tr.getId(), item.getAccountName(), item.getAmount(),
-                                 item.getCurrency(), item.getComment()
+                                 Misc.nullIsEmpty(item.getCurrency()), item.getComment()
                     });
         }
 //        debug("profile", String.format("Transaction %d stored", tr.getId()));
@@ -390,17 +391,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});
@@ -489,9 +489,26 @@ public final class MobileLedgerProfile {
             db.endTransaction();
         }
     }
+    public List<Currency> getCurrencies() {
+        SQLiteDatabase db = App.getDatabase();
+
+        ArrayList<Currency> result = new ArrayList<>();
+
+        try (Cursor c = db.rawQuery("SELECT c.id, c.name, c.position, c.has_gap FROM currencies c",
+                new String[]{}))
+        {
+            while (c.moveToNext()) {
+                Currency currency = new Currency(c.getInt(0), c.getString(1),
+                        Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1);
+                result.add(currency);
+            }
+        }
+
+        return result;
+    }
     public enum FutureDates {
-        None(0), OneMonth(30), TwoMonths(60), ThreeMonths(90), SixMonths(180), OneYear(365),
-        All(-1);
+        None(0), OneWeek(7), TwoWeeks(14), OneMonth(30), TwoMonths(60), ThreeMonths(90),
+        SixMonths(180), OneYear(365), All(-1);
         private static SparseArray<FutureDates> map = new SparseArray<>();
 
         static {
@@ -512,6 +529,10 @@ public final class MobileLedgerProfile {
         }
         public String getText(Resources resources) {
             switch (value) {
+                case 7:
+                    return resources.getString(R.string.future_dates_7);
+                case 14:
+                    return resources.getString(R.string.future_dates_14);
                 case 30:
                     return resources.getString(R.string.future_dates_30);
                 case 60: