X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=0e42f87dfcd75b3e0de018dc1c23224c8807675b;hb=451569cb01799c684b210cd6839d68825092a117;hp=e0b4e2eb1e6df6f5cf0dfcc868e55e325fe620b6;hpb=2de3d8a8c96e78f4ab89880be9fab05735acc910;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
index e0b4e2eb..0e42f87d 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -18,15 +18,22 @@
package net.ktnx.mobileledger.async;
import android.annotation.SuppressLint;
-import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.OperationCanceledException;
import androidx.annotation.NonNull;
+import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
-import net.ktnx.mobileledger.App;
+import net.ktnx.mobileledger.dao.AccountDAO;
+import net.ktnx.mobileledger.dao.TransactionDAO;
+import net.ktnx.mobileledger.db.Account;
+import net.ktnx.mobileledger.db.AccountWithAmounts;
+import net.ktnx.mobileledger.db.DB;
+import net.ktnx.mobileledger.db.Option;
+import net.ktnx.mobileledger.db.Profile;
+import net.ktnx.mobileledger.db.TransactionWithAccounts;
import net.ktnx.mobileledger.err.HTTPException;
import net.ktnx.mobileledger.json.API;
import net.ktnx.mobileledger.json.AccountListParser;
@@ -36,7 +43,6 @@ import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerAccount;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.MainModel;
import net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.NetworkUtil;
@@ -52,6 +58,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -75,21 +82,18 @@ public class RetrieveTransactionsTask extends
private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\"");
private static final Pattern reDecimalPoint = Pattern.compile("\\.\\d\\d?$");
private static final Pattern reDecimalComma = Pattern.compile(",\\d\\d?$");
+ private static final String TAG = "RTT";
// %3A is '='
private final Pattern reAccountName =
Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
private final Pattern reAccountValue = Pattern.compile(
"\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
private final MainModel mainModel;
- private final MobileLedgerProfile profile;
- private final List prevAccounts;
+ private final Profile profile;
private int expectedPostingsCount = -1;
- public RetrieveTransactionsTask(@NonNull MainModel mainModel,
- @NonNull MobileLedgerProfile profile,
- List accounts) {
+ public RetrieveTransactionsTask(@NonNull MainModel mainModel, @NonNull Profile profile) {
this.mainModel = mainModel;
this.profile = profile;
- this.prevAccounts = accounts;
}
private static void L(String msg) {
//debug("transaction-parser", msg);
@@ -121,9 +125,6 @@ public class RetrieveTransactionsTask extends
return null;
}
}
- public MobileLedgerProfile getProfile() {
- return profile;
- }
@Override
protected void onProgressUpdate(Progress... values) {
super.onProgressUpdate(values);
@@ -214,7 +215,7 @@ public class RetrieveTransactionsTask extends
else {
parentAccount = null;
}
- lastAccount = new LedgerAccount(profile, accName, parentAccount);
+ lastAccount = new LedgerAccount(accName, parentAccount);
accounts.add(lastAccount);
map.put(accName, lastAccount);
@@ -328,7 +329,7 @@ public class RetrieveTransactionsTask extends
state = ParserState.EXPECTING_TRANSACTION;
L(String.format("transaction %s parsed â expecting transaction",
- transaction.getId()));
+ transaction.getLedgerId()));
// sounds like a good idea, but transaction-1 may not be the first one chronologically
// for example, when you add the initial seeding transaction after entering some others
@@ -343,8 +344,9 @@ public class RetrieveTransactionsTask extends
LedgerTransactionAccount lta = parseTransactionAccountLine(line);
if (lta != null) {
transaction.addAccount(lta);
- L(String.format(Locale.ENGLISH, "%d: %s = %s", transaction.getId(),
- lta.getAccountName(), lta.getAmount()));
+ L(String.format(Locale.ENGLISH, "%d: %s = %s",
+ transaction.getLedgerId(), lta.getAccountName(),
+ lta.getAmount()));
}
else
throw new IllegalStateException(
@@ -378,7 +380,7 @@ public class RetrieveTransactionsTask extends
parentAccount = null;
}
- acc = new LedgerAccount(profile, accountName, parentAccount);
+ acc = new LedgerAccount(accountName, parentAccount);
createdAccounts.add(acc);
return acc;
}
@@ -387,7 +389,7 @@ public class RetrieveTransactionsTask extends
}
private List retrieveAccountList()
throws IOException, HTTPException, ApiNotSupportedException {
- final API apiVersion = profile.getApiVersion();
+ final API apiVersion = API.valueOf(profile.getApiVersion());
if (apiVersion.equals(API.auto)) {
return retrieveAccountListAnyVersion();
}
@@ -401,21 +403,20 @@ public class RetrieveTransactionsTask extends
}
}
private List retrieveAccountListAnyVersion()
- throws HTTPException, ApiNotSupportedException {
+ throws ApiNotSupportedException, IOException, HTTPException {
for (API ver : API.allVersions) {
try {
return retrieveAccountListForVersion(ver);
}
- catch (Exception e) {
+ catch (JsonParseException | RuntimeJsonMappingException e) {
Logger.debug("json",
String.format(Locale.US, "Error during account list retrieval using API %s",
- ver.getDescription()));
+ ver.getDescription()), e);
}
- throw new ApiNotSupportedException();
}
- throw new RuntimeException("This should never be reached");
+ throw new ApiNotSupportedException();
}
private List retrieveAccountListForVersion(API version)
throws IOException, HTTPException {
@@ -430,12 +431,8 @@ public class RetrieveTransactionsTask extends
throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
}
publishProgress(Progress.indeterminate());
- SQLiteDatabase db = App.getDatabase();
ArrayList list = new ArrayList<>();
HashMap map = new HashMap<>();
- HashMap currentMap = new HashMap<>();
- for (LedgerAccount acc : prevAccounts)
- currentMap.put(acc.getName(), acc);
throwIfCancelled();
try (InputStream resp = http.getInputStream()) {
throwIfCancelled();
@@ -455,20 +452,11 @@ public class RetrieveTransactionsTask extends
throwIfCancelled();
}
- // the current account tree may have changed, update the new-to be tree to match
- for (LedgerAccount acc : list) {
- LedgerAccount prevData = currentMap.get(acc.getName());
- if (prevData != null) {
- acc.setExpanded(prevData.isExpanded());
- acc.setAmountsExpanded(prevData.amountsExpanded());
- }
- }
-
return list;
}
private List retrieveTransactionList()
throws ParseException, HTTPException, IOException, ApiNotSupportedException {
- final API apiVersion = profile.getApiVersion();
+ final API apiVersion = API.valueOf(profile.getApiVersion());
if (apiVersion.equals(API.auto)) {
return retrieveTransactionListAnyVersion();
}
@@ -488,16 +476,15 @@ public class RetrieveTransactionsTask extends
try {
return retrieveTransactionListForVersion(ver);
}
- catch (Exception | HTTPException e) {
+ catch (Exception e) {
Logger.debug("json",
String.format(Locale.US, "Error during account list retrieval using API %s",
ver.getDescription()));
}
- throw new ApiNotSupportedException();
}
- throw new RuntimeException("This should never be reached");
+ throw new ApiNotSupportedException();
}
private List retrieveTransactionListForVersion(API apiVersion)
throws IOException, ParseException, HTTPException {
@@ -555,7 +542,7 @@ public class RetrieveTransactionsTask extends
.compareTo(o1.getDate());
if (res != 0)
return res;
- return Long.compare(o2.getId(), o1.getId());
+ return Long.compare(o2.getLedgerId(), o1.getLedgerId());
});
return trList;
}
@@ -582,9 +569,12 @@ public class RetrieveTransactionsTask extends
transactions = new ArrayList<>();
retrieveTransactionListLegacy(accounts, transactions);
}
- mainModel.setAndStoreAccountAndTransactionListFromWeb(accounts, transactions);
- return new Result(accounts, transactions);
+ mainModel.updateDisplayedTransactionsFromWeb(transactions);
+
+ new AccountAndTransactionListSaver(accounts, transactions).start();
+
+ return new Result(null);
}
catch (MalformedURLException e) {
e.printStackTrace();
@@ -592,8 +582,8 @@ public class RetrieveTransactionsTask extends
}
catch (HTTPException e) {
e.printStackTrace();
- return new Result(String.format("HTTP error %d: %s", e.getResponseCode(),
- e.getResponseMessage()));
+ return new Result(
+ String.format("HTTP error %d: %s", e.getResponseCode(), e.getMessage()));
}
catch (IOException e) {
e.printStackTrace();
@@ -716,4 +706,60 @@ public class RetrieveTransactionsTask extends
this.transactions = transactions;
}
}
+
+ private class AccountAndTransactionListSaver extends Thread {
+ private final List accounts;
+ private final List transactions;
+ public AccountAndTransactionListSaver(List accounts,
+ List transactions) {
+ this.accounts = accounts;
+ this.transactions = transactions;
+ }
+ private void storeAccountsAndTransactions(List accounts,
+ List transactions) {
+ AccountDAO accDao = DB.get()
+ .getAccountDAO();
+ TransactionDAO trDao = DB.get()
+ .getTransactionDAO();
+
+ Logger.debug(TAG, "Preparing account list");
+ final List list = new ArrayList<>();
+ for (LedgerAccount acc : accounts) {
+ final AccountWithAmounts a = acc.toDBOWithAmounts();
+ Account existing = accDao.getByNameSync(profile.getId(), acc.getName());
+ if (existing != null) {
+ a.account.setExpanded(existing.isExpanded());
+ a.account.setAmountsExpanded(existing.isAmountsExpanded());
+ a.account.setId(
+ existing.getId()); // not strictly needed, but since we have it
+ // anyway...
+ }
+
+ list.add(a);
+ }
+ Logger.debug(TAG, "Account list prepared. Storing");
+ accDao.storeAccountsSync(list, profile.getId());
+ Logger.debug(TAG, "Account list stored");
+
+ Logger.debug(TAG, "Preparing transaction list");
+ final List tranList = new ArrayList<>();
+
+ for (LedgerTransaction tr : transactions)
+ tranList.add(tr.toDBO());
+
+ Logger.debug(TAG, "Storing transaction list");
+ trDao.storeTransactionsSync(tranList, profile.getId());
+
+ Logger.debug(TAG, "Transactions stored");
+
+ DB.get()
+ .getOptionDAO()
+ .insertSync(new Option(profile.getId(), Option.OPT_LAST_SCRAPE,
+ String.valueOf((new Date()).getTime())));
+ }
+ @Override
+ public void run() {
+ storeAccountsAndTransactions(accounts, transactions);
+ }
+ }
}