move DB access routines to the application class

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
index f8e262ef93a1d90c4aea46bdf5bdbe856e0a604f..5093d50c952287846284c1390e07da2259453b23 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -20,26 +20,27 @@ package net.ktnx.mobileledger.async;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.util.Log;
 
+import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.model.TransactionListItem;
 import net.ktnx.mobileledger.utils.Globals;
-import net.ktnx.mobileledger.utils.MLDB;
 
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
     protected String doInBackground(String[] filterAccName) {
-        Data.backgroundTaskCount.incrementAndGet();
-        final MobileLedgerProfile profile = Data.profile.get();
+        final MobileLedgerProfile profile = Data.profile.getValue();
         if (profile == null) return "Profile not configured";
 
         String profile_uuid = profile.getUuid();
+        Data.backgroundTaskStarted();
         try {
             ArrayList<TransactionListItem> newList = new ArrayList<>();
 
@@ -61,8 +62,8 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
                 params = new String[]{profile_uuid, filterAccName[0]};
             }
 
-            Log.d("UTT", sql);
-            SQLiteDatabase db = MLDB.getReadableDatabase();
+            debug("UTT", sql);
+            SQLiteDatabase db = App.getDatabase();
             String lastDateString = Globals.formatLedgerDate(new Date());
             Date lastDate = Globals.parseLedgerDate(lastDateString);
             boolean odd = true;
@@ -81,14 +82,14 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
                     }
                     newList.add(
                             new TransactionListItem(new LedgerTransaction(transaction_id), odd));
-//                    Log.d("UTT", String.format("got transaction %d", transaction_id));
+//                    debug("UTT", String.format("got transaction %d", transaction_id));
 
                     lastDate = date;
                     lastDateString = dateString;
                     odd = !odd;
                 }
-                Data.transactions.set(newList);
-                Log.d("UTT", "transaction list value updated");
+                Data.transactions.setList(newList);
+                debug("UTT", "transaction list value updated");
             }
 
             return null;
@@ -97,7 +98,7 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
             return String.format("Error parsing stored date '%s'", e.getMessage());
         }
         finally {
-            Data.backgroundTaskCount.decrementAndGet();
+            Data.backgroundTaskFinished();
         }
     }
 }