X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FMobileLedgerProfile.java;h=d7fae411f5ea94e42519bcac9ecf9843a22bcae3;hp=d0283cbfebaacd720a84ca301184f76f3864b3b4;hb=90383a155ec16a9f13b1e6ac94a118033e09b3aa;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438

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 d0283cbf..d7fae411 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -20,14 +20,16 @@ package net.ktnx.mobileledger.model;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.async.DbOpQueue;
 import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.LockHolder;
+import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.UUID;
 
 import androidx.annotation.NonNull;
@@ -52,12 +54,24 @@ 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) {
         MobileLedgerProfile result = null;
-        List<MobileLedgerProfile> list = new ArrayList<>();
-        SQLiteDatabase db = MLDB.getDatabase();
+        ArrayList<MobileLedgerProfile> list = new ArrayList<>();
+        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 FROM " +
@@ -78,22 +92,19 @@ public final class MobileLedgerProfile {
                 if (item.getUuid().equals(currentProfileUUID)) result = item;
             }
         }
-        Data.profiles.setList(list);
+        Data.profiles.setValue(list);
         return result;
     }
     public static void storeProfilesOrder() {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         db.beginTransaction();
         try {
             int orderNo = 0;
-            try (LockHolder lh = Data.profiles.lockForReading()) {
-                for (int i = 0; i < Data.profiles.size(); i++) {
-                    MobileLedgerProfile p = Data.profiles.get(i);
-                    db.execSQL("update profiles set order_no=? where uuid=?",
-                            new Object[]{orderNo, p.getUuid()});
-                    p.orderNo = orderNo;
-                    orderNo++;
-                }
+            for (MobileLedgerProfile p : Data.profiles.getValue()) {
+                db.execSQL("update profiles set order_no=? where uuid=?",
+                        new Object[]{orderNo, p.getUuid()});
+                p.orderNo = orderNo;
+                orderNo++;
             }
             db.setTransactionSuccessful();
         }
@@ -162,7 +173,7 @@ public final class MobileLedgerProfile {
         this.authPassword = authPassword;
     }
     public void storeInDB() {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         db.beginTransaction();
         try {
 //            debug("profiles", String.format("Storing profile in DB: uuid=%s, name=%s, " +
@@ -225,10 +236,10 @@ public final class MobileLedgerProfile {
                                  item.getCurrency()
                     });
         }
-        debug("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();
+        SQLiteDatabase db = App.getDatabase();
         try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
                 new String[]{uuid, name}))
         {
@@ -279,7 +290,7 @@ public final class MobileLedgerProfile {
         setOption(name, String.valueOf(value));
     }
     public void removeFromDB() {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         debug("db", String.format("removing profile %s from DB", uuid));
         db.beginTransaction();
         try {
@@ -297,12 +308,12 @@ public final class MobileLedgerProfile {
     }
     @NonNull
     public LedgerAccount loadAccount(String name) {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         return loadAccount(db, name);
     }
     @Nullable
     public LedgerAccount tryLoadAccount(String acct_name) {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         return tryLoadAccount(db, acct_name);
     }
     @NonNull
@@ -342,7 +353,7 @@ public final class MobileLedgerProfile {
     }
     public LedgerTransaction loadTransaction(int transactionId) {
         LedgerTransaction tr = new LedgerTransaction(transactionId, this.uuid);
-        tr.loadData(MLDB.getDatabase());
+        tr.loadData(App.getDatabase());
 
         return tr;
     }
@@ -393,7 +404,7 @@ public final class MobileLedgerProfile {
     }
     public List<LedgerAccount> loadChildAccountsOf(LedgerAccount acc) {
         List<LedgerAccount> result = new ArrayList<>();
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         try (Cursor c = db.rawQuery(
                 "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'",
                 new String[]{uuid, acc.getName()}))
@@ -411,7 +422,7 @@ public final class MobileLedgerProfile {
         ArrayList<LedgerAccount> visibleList = new ArrayList<>();
         visibleList.add(acc);
 
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         try (Cursor c = db.rawQuery(
                 "SELECT a.name FROM accounts a WHERE a.profile = ? and a.name like ?||':%'",
                 new String[]{uuid, acc.getName()}))
@@ -428,7 +439,7 @@ public final class MobileLedgerProfile {
         return result;
     }
     public void wipeAllData() {
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         db.beginTransaction();
         try {
             String[] pUuid = new String[]{uuid};
@@ -438,6 +449,7 @@ public final class MobileLedgerProfile {
             db.execSQL("delete from transactions where profile=?", pUuid);
             db.execSQL("delete from transaction_accounts where profile=?", pUuid);
             db.setTransactionSuccessful();
+            Logger.debug("wipe", String.format(Locale.ENGLISH, "Profile %s wiped out", pUuid[0]));
         }
         finally {
             db.endTransaction();