X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=1152cdeaeef3a036c7e0b2b59a20da06e4c7588e;hb=c573b352226ba1dadb779bdc27df888b9fa23fde;hp=0f3d022ad785905a004d337f3f7233ca02ee72c7;hpb=9e8a289a85a65d372b47ccd2c2261299972ae4dd;p=mobile-ledger-staging.git
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 0f3d022a..1152cdea 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -1,18 +1,18 @@
/*
* 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 .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.async;
@@ -20,26 +20,29 @@ 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.Calendar;
import java.util.Date;
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
public class UpdateTransactionsTask extends AsyncTask {
protected String doInBackground(String[] filterAccName) {
- Data.backgroundTaskCount.incrementAndGet();
- final MobileLedgerProfile profile = Data.profile.get();
- if (profile == null) return "Profile not configured";
+ final MobileLedgerProfile profile = Data.profile.getValue();
+ if (profile == null)
+ return "Profile not configured";
String profile_uuid = profile.getUuid();
+ Data.backgroundTaskStarted();
try {
ArrayList newList = new ArrayList<>();
@@ -61,35 +64,36 @@ public class UpdateTransactionsTask extends AsyncTask {
params = new String[]{profile_uuid, filterAccName[0]};
}
- Log.d("UTT", sql);
- SQLiteDatabase db = MLDB.getReadableDatabase();
- Date lastDate = null;
+ debug("UTT", sql);
+ SQLiteDatabase db = App.getDatabase();
+ String lastDateString = Globals.formatLedgerDate(new Date());
+ Calendar lastDate = Globals.parseLedgerDateAsCalendar(lastDateString);
boolean odd = true;
try (Cursor cursor = db.rawQuery(sql, params)) {
while (cursor.moveToNext()) {
- if (isCancelled()) return null;
+ if (isCancelled())
+ return null;
int transaction_id = cursor.getInt(0);
String dateString = cursor.getString(1);
- Date date = Globals.parseLedgerDate(dateString);
+ Calendar date = Globals.parseLedgerDateAsCalendar(dateString);
- if ((lastDate == null) || !lastDate.equals(date)) {
- boolean showMonth = (lastDate == null) || (date != null) &&
- (date.getMonth() !=
- lastDate.getMonth() ||
- date.getYear() !=
- lastDate.getYear());
- newList.add(new TransactionListItem(date, showMonth));
+ if (!lastDateString.equals(dateString)) {
+ boolean showMonth =
+ (date.get(Calendar.MONTH) != lastDate.get(Calendar.MONTH)) ||
+ (date.get(Calendar.YEAR) != lastDate.get(Calendar.YEAR));
+ newList.add(new TransactionListItem(date.getTime(), showMonth));
}
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;
@@ -98,7 +102,7 @@ public class UpdateTransactionsTask extends AsyncTask {
return String.format("Error parsing stored date '%s'", e.getMessage());
}
finally {
- Data.backgroundTaskCount.decrementAndGet();
+ Data.backgroundTaskFinished();
}
}
}