X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FCommitAccountsTask.java;h=2c3d90f83947f9c7576624d718a84f9c218b4847;hp=7fb96b9d6158d4d87a62967bac94894715a2fe63;hb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438;hpb=ffbfe16379b73aaf0bc68b4251c2acb930a19d26

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java
index 7fb96b9d..2c3d90f8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java
@@ -1,59 +1,66 @@
 /*
  * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.async;
 
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.util.Log;
 
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
+import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 public class CommitAccountsTask
         extends AsyncTask<CommitAccountsTaskParams, Void, ArrayList<LedgerAccount>> {
     protected ArrayList<LedgerAccount> doInBackground(CommitAccountsTaskParams... params) {
-        Data.backgroundTaskCount.incrementAndGet();
+        Data.backgroundTaskStarted();
         ArrayList<LedgerAccount> newList = new ArrayList<>();
+        String profile = Data.profile.get().getUuid();
         try {
 
-            SQLiteDatabase db = MLDB.getWritableDatabase();
+            SQLiteDatabase db = MLDB.getDatabase();
             db.beginTransaction();
             try {
-                for (LedgerAccount acc : params[0].accountList) {
-                    Log.d("db", String.format("Setting %s to %s", acc.getName(),
-                            acc.isHidden() ? "hidden" : "starred"));
-                    db.execSQL("UPDATE accounts SET hidden=? WHERE name=?",
-                            new Object[]{acc.isHiddenToBe() ? 1 : 0, acc.getName()});
-
-                    acc.setHidden(acc.isHiddenToBe());
-                    if (!params[0].showOnlyStarred || !acc.isHidden()) newList.add(acc);
+                try (LockHolder lh = params[0].accountList.lockForWriting()) {
+                    for (int i = 0; i < params[0].accountList.size(); i++ ){
+                        LedgerAccount acc = params[0].accountList.get(i);
+                        debug("CAT", String.format("Setting %s to %s", acc.getName(),
+                                acc.isHiddenByStarToBe() ? "hidden" : "starred"));
+                        db.execSQL("UPDATE accounts SET hidden=? WHERE profile=? AND name=?",
+                                new Object[]{acc.isHiddenByStarToBe() ? 1 : 0, profile, acc.getName()
+                                });
+
+                        acc.setHiddenByStar(acc.isHiddenByStarToBe());
+                        if (!params[0].showOnlyStarred || !acc.isHiddenByStar()) newList.add(acc);
+                    }
+                    db.setTransactionSuccessful();
                 }
-                db.setTransactionSuccessful();
             }
             finally {
                 db.endTransaction();
             }
         }
         finally {
-            Data.backgroundTaskCount.decrementAndGet();
+            Data.backgroundTaskFinished();
         }
 
         return newList;