wrap Log.d calls, skipping them on non-debug builds

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / CommitAccountsTask.java

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 8f8c1dac98e6c4ea5fc9bc16255bca64e10e066a..2c3d90f83947f9c7576624d718a84f9c218b4847 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/CommitAccountsTask.java
@@ -19,18 +19,20 @@ 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 {
@@ -38,9 +40,10 @@ public class CommitAccountsTask
             SQLiteDatabase db = MLDB.getDatabase();
             db.beginTransaction();
             try {
+                try (LockHolder lh = params[0].accountList.lockForWriting()) {
                     for (int i = 0; i < params[0].accountList.size(); i++ ){
                         LedgerAccount acc = params[0].accountList.get(i);
-                        Log.d("CAT", String.format("Setting %s to %s", acc.getName(),
+                        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()
@@ -48,6 +51,7 @@ public class CommitAccountsTask
 
                         acc.setHiddenByStar(acc.isHiddenByStarToBe());
                         if (!params[0].showOnlyStarred || !acc.isHiddenByStar()) newList.add(acc);
+                    }
                     db.setTransactionSuccessful();
                 }
             }
@@ -56,7 +60,7 @@ public class CommitAccountsTask
             }
         }
         finally {
-            Data.backgroundTaskCount.decrementAndGet();
+            Data.backgroundTaskFinished();
         }
 
         return newList;