X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=4822a92aa15182f974db2e3d8a6560dc7023296d;hb=bffab241768ba54b1a5fdaa101cbf027c1c2ab98;hp=93a954f0a674bc95354eeb70d6c00831293f487b;hpb=cd2ce61529771ef3054e4fa501ce64fcff9fa818;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 93a954f0..4822a92a 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -19,7 +19,6 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
 import net.ktnx.mobileledger.async.DbOpQueue;
 import net.ktnx.mobileledger.utils.Globals;
@@ -34,6 +33,8 @@ 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 String uuid;
     private String name;
@@ -51,6 +52,18 @@ public final class MobileLedgerProfile {
     public MobileLedgerProfile(String uuid) {
         this.uuid = uuid;
     }
+    public MobileLedgerProfile(MobileLedgerProfile origin) {
+        uuid = origin.uuid;
+        name = origin.name;
+        permitPosting = origin.permitPosting;
+        preferredAccountsFilter = origin.preferredAccountsFilter;
+        url = origin.url;
+        authEnabled = origin.authEnabled;
+        authUserName = origin.authUserName;
+        authPassword = origin.authPassword;
+        themeId = origin.themeId;
+        orderNo = origin.orderNo;
+    }
     // loads all profiles into Data.profiles
     // returns the profile with the given UUID
     public static MobileLedgerProfile loadAllFromDB(String currentProfileUUID) {
@@ -164,7 +177,7 @@ public final class MobileLedgerProfile {
         SQLiteDatabase db = MLDB.getDatabase();
         db.beginTransaction();
         try {
-//            Log.d("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " +
+//            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));
@@ -197,7 +210,7 @@ public final class MobileLedgerProfile {
                 new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
                              acc.getLevel(), acc.isHiddenByStar(), acc.isExpanded()
                 });
-//        Log.d("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid));
+//        debug("accounts", String.format("Stored account '%s' in DB [%s]", acc.getName(), uuid));
     }
     public void storeAccountValue(SQLiteDatabase db, String name, String currency, Float amount) {
         db.execSQL("replace into account_values(profile, account, " +
@@ -224,7 +237,7 @@ public final class MobileLedgerProfile {
                                  item.getCurrency()
                     });
         }
-        Log.d("profile", String.format("Transaction %d stored", tr.getId()));
+//        debug("profile", String.format("Transaction %d stored", tr.getId()));
     }
     public String getOption(String name, String default_value) {
         SQLiteDatabase db = MLDB.getDatabase();
@@ -235,17 +248,17 @@ public final class MobileLedgerProfile {
                 String result = cursor.getString(0);
 
                 if (result == null) {
-                    Log.d("profile", "returning default value for " + name);
+                    debug("profile", "returning default value for " + name);
                     result = default_value;
                 }
-                else Log.d("profile", String.format("option %s=%s", name, result));
+                else debug("profile", String.format("option %s=%s", name, result));
 
                 return result;
             }
             else return default_value;
         }
         catch (Exception e) {
-            Log.d("db", "returning default value for " + name, e);
+            debug("db", "returning default value for " + name, e);
             return default_value;
         }
     }
@@ -253,16 +266,16 @@ public final class MobileLedgerProfile {
         long longResult;
         String result = getOption(name, "");
         if ((result == null) || result.isEmpty()) {
-            Log.d("profile", String.format("Returning default value for option %s", name));
+            debug("profile", String.format("Returning default value for option %s", name));
             longResult = default_value;
         }
         else {
             try {
                 longResult = Long.parseLong(result);
-                Log.d("profile", String.format("option %s=%s", name, result));
+                debug("profile", String.format("option %s=%s", name, result));
             }
             catch (Exception e) {
-                Log.d("profile", String.format("Returning default value for option %s", name), e);
+                debug("profile", String.format("Returning default value for option %s", name), e);
                 longResult = default_value;
             }
         }
@@ -270,7 +283,7 @@ public final class MobileLedgerProfile {
         return longResult;
     }
     public void setOption(String name, String value) {
-        Log.d("profile", String.format("setting option %s=%s", name, value));
+        debug("profile", String.format("setting option %s=%s", name, value));
         DbOpQueue.add("insert or replace into options(profile, name, value) values(?, ?, ?);",
                 new String[]{uuid, name, value});
     }
@@ -279,7 +292,7 @@ public final class MobileLedgerProfile {
     }
     public void removeFromDB() {
         SQLiteDatabase db = MLDB.getDatabase();
-        Log.d("db", String.format("removing profile %s from DB", uuid));
+        debug("db", String.format("removing profile %s from DB", uuid));
         db.beginTransaction();
         try {
             Object[] uuid_param = new Object[]{uuid};
@@ -346,14 +359,14 @@ public final class MobileLedgerProfile {
         return tr;
     }
     public int getThemeId() {
-//        Log.d("profile", String.format("Profile.getThemeId() returning %d", themeId));
+//        debug("profile", String.format("Profile.getThemeId() returning %d", themeId));
         return this.themeId;
     }
     public void setThemeId(Object o) {
         setThemeId(Integer.valueOf(String.valueOf(o)).intValue());
     }
     public void setThemeId(int themeId) {
-//        Log.d("profile", String.format("Profile.setThemeId(%d) called", themeId));
+//        debug("profile", String.format("Profile.setThemeId(%d) called", themeId));
         this.themeId = themeId;
     }
     public void markTransactionsAsNotPresent(SQLiteDatabase db) {
@@ -385,10 +398,10 @@ public final class MobileLedgerProfile {
         db.execSQL("DELETE FROM transactions WHERE profile=? AND keep = 0", new String[]{uuid});
     }
     public void setLastUpdateStamp() {
-        Log.d("db", "Updating transaction value stamp");
+        debug("db", "Updating transaction value stamp");
         Date now = new Date();
         setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
-        Data.lastUpdateDate.set(now);
+        Data.lastUpdateDate.postValue(now);
     }
     public List<LedgerAccount> loadChildAccountsOf(LedgerAccount acc) {
         List<LedgerAccount> result = new ArrayList<>();