X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=f8e262ef93a1d90c4aea46bdf5bdbe856e0a604f;hb=c0b1645b9f14e6b25803efd2fa048e27030ba5e6;hp=dc02fe9f339d42204c772ae038efd65c9ddee765;hpb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;p=mobile-ledger.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 dc02fe9f..f8e262ef 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;
@@ -24,6 +24,7 @@ import android.util.Log;
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;
@@ -35,7 +36,10 @@ import java.util.Date;
public class UpdateTransactionsTask extends AsyncTask {
protected String doInBackground(String[] filterAccName) {
Data.backgroundTaskCount.incrementAndGet();
- String profile_uuid = Data.profile.get().getUuid();
+ final MobileLedgerProfile profile = Data.profile.get();
+ if (profile == null) return "Profile not configured";
+
+ String profile_uuid = profile.getUuid();
try {
ArrayList newList = new ArrayList<>();
@@ -59,7 +63,8 @@ public class UpdateTransactionsTask extends AsyncTask {
Log.d("UTT", sql);
SQLiteDatabase db = MLDB.getReadableDatabase();
- Date lastDate = null;
+ String lastDateString = Globals.formatLedgerDate(new Date());
+ Date lastDate = Globals.parseLedgerDate(lastDateString);
boolean odd = true;
try (Cursor cursor = db.rawQuery(sql, params)) {
while (cursor.moveToNext()) {
@@ -69,12 +74,9 @@ public class UpdateTransactionsTask extends AsyncTask {
String dateString = cursor.getString(1);
Date date = Globals.parseLedgerDate(dateString);
- if ((lastDate == null) || !lastDate.equals(date)) {
- boolean showMonth = (lastDate == null) || (date != null) &&
- (date.getMonth() !=
- lastDate.getMonth() ||
- date.getYear() !=
- lastDate.getYear());
+ if (!lastDateString.equals(dateString)) {
+ boolean showMonth = (date.getMonth() != lastDate.getMonth() ||
+ date.getYear() != lastDate.getYear());
newList.add(new TransactionListItem(date, showMonth));
}
newList.add(
@@ -82,6 +84,7 @@ public class UpdateTransactionsTask extends AsyncTask {
// Log.d("UTT", String.format("got transaction %d", transaction_id));
lastDate = date;
+ lastDateString = dateString;
odd = !odd;
}
Data.transactions.set(newList);