X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=0bf763a981656a3812941186d797d67474ddc6b1;hb=a605170cc14fdc51be6693edcde8e4d31532f252;hp=63b30b5c0a9467d71163d062ee866bb7ff6c6c05;hpb=70c486fbea2d6606f68d35fceedc90680fd13f7f;p=mobile-ledger-staging.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 63b30b5c..0bf763a9 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -1,177 +1,340 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2019 Damyan Ivanov.
+ * 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;
import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
+import android.os.OperationCanceledException;
import android.util.Log;
-import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.TransactionListActivity;
+import net.ktnx.mobileledger.err.HTTPException;
+import net.ktnx.mobileledger.json.AccountListParser;
+import net.ktnx.mobileledger.json.ParsedBalance;
+import net.ktnx.mobileledger.json.ParsedLedgerAccount;
+import net.ktnx.mobileledger.json.ParsedLedgerTransaction;
+import net.ktnx.mobileledger.json.TransactionListParser;
+import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.model.LedgerAccount;
import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionItem;
+import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.activity.MainActivity;
import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.NetworkUtil;
import java.io.BufferedReader;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.ref.WeakReference;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Stack;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class RetrieveTransactionsTask extends
- AsyncTask {
- private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+) | ");
- private static final Pattern transactionDescriptionPattern =
+public class RetrieveTransactionsTask
+ extends AsyncTask {
+ private static final int MATCHING_TRANSACTIONS_LIMIT = 150;
+ private static final Pattern reComment = Pattern.compile("^\\s*;");
+ private static final Pattern reTransactionStart = Pattern.compile("([\\d.-]+) | ");
+ private static final Pattern reTransactionDescription =
Pattern.compile("
contextRef;
- protected int error;
- private boolean success;
- public RetrieveTransactionsTask(WeakReference contextRef) {
+ private static final Pattern reTransactionDetails =
+ Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
+ private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\"");
+ private WeakReference contextRef;
+ private int error;
+ // %3A is '='
+ private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+ private Pattern reAccountValue = Pattern.compile(
+ "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
+ public RetrieveTransactionsTask(WeakReference contextRef) {
this.contextRef = contextRef;
}
- private static final void L(String msg) {
- Log.d("transaction-parser", msg);
+ private static void L(String msg) {
+ //Log.d("transaction-parser", msg);
}
@Override
protected void onProgressUpdate(Progress... values) {
super.onProgressUpdate(values);
- TransactionListActivity context = getContext();
+ MainActivity context = getContext();
if (context == null) return;
context.onRetrieveProgress(values[0]);
}
@Override
protected void onPreExecute() {
super.onPreExecute();
- TransactionListActivity context = getContext();
+ MainActivity context = getContext();
if (context == null) return;
context.onRetrieveStart();
}
@Override
- protected void onPostExecute(Void aVoid) {
- super.onPostExecute(aVoid);
- TransactionListActivity context = getContext();
+ protected void onPostExecute(String error) {
+ super.onPostExecute(error);
+ MainActivity context = getContext();
if (context == null) return;
- context.onRetrieveDone(success);
+ context.onRetrieveDone(error);
}
- @SuppressLint("DefaultLocale")
@Override
- protected Void doInBackground(Params... params) {
+ protected void onCancelled() {
+ super.onCancelled();
+ MainActivity context = getContext();
+ if (context == null) return;
+ context.onRetrieveDone(null);
+ }
+ private String retrieveTransactionListLegacy(MobileLedgerProfile profile)
+ throws IOException, ParseException, HTTPException {
Progress progress = new Progress();
- success = false;
- try {
- HttpURLConnection http =
- NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal");
- http.setAllowUserInteraction(false);
- publishProgress(progress);
- Context ctx = contextRef.get();
- if (ctx == null) return null;
- try (SQLiteDatabase db = MLDB.getWritableDatabase(ctx)) {
- try (InputStream resp = http.getInputStream()) {
- if (http.getResponseCode() != 200) throw new IOException(
- String.format("HTTP error %d", http.getResponseCode()));
- db.beginTransaction();
- try {
- db.execSQL("DELETE FROM transactions;");
- db.execSQL("DELETE FROM transaction_accounts");
-
- int state = ParserState.EXPECTING_JOURNAL;
- String line;
- BufferedReader buf =
- new BufferedReader(new InputStreamReader(resp, "UTF-8"));
-
- int transactionCount = 0;
- int transactionId = 0;
- LedgerTransaction transaction = null;
- LINES:
- while ((line = buf.readLine()) != null) {
- if (isCancelled()) break;
- Matcher m;
- //L(String.format("State is %d", state));
- switch (state) {
- case ParserState.EXPECTING_JOURNAL:
- if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
- if (line.equals("General Journal
")) {
- state = ParserState.EXPECTING_TRANSACTION;
- L("â expecting transaction");
+ int maxTransactionId = Progress.INDETERMINATE;
+ ArrayList accountList = new ArrayList<>();
+ HashMap accountNames = new HashMap<>();
+ HashMap syntheticAccounts = new HashMap<>();
+ LedgerAccount lastAccount = null, prevAccount = null;
+ boolean onlyStarred = Data.optShowOnlyStarred.get();
+
+ HttpURLConnection http = NetworkUtil.prepareConnection(profile, "journal");
+ http.setAllowUserInteraction(false);
+ publishProgress(progress);
+ switch (http.getResponseCode()) {
+ case 200:
+ break;
+ default:
+ throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
+ }
+ try (SQLiteDatabase db = MLDB.getDatabase()) {
+ try (InputStream resp = http.getInputStream()) {
+ if (http.getResponseCode() != 200)
+ throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+ db.beginTransaction();
+ try {
+ prepareDbForRetrieval(db, profile);
+
+ int matchedTransactionsCount = 0;
+
+
+ ParserState state = ParserState.EXPECTING_ACCOUNT;
+ String line;
+ BufferedReader buf =
+ new BufferedReader(new InputStreamReader(resp, StandardCharsets.UTF_8));
+
+ int processedTransactionCount = 0;
+ int transactionId = 0;
+ LedgerTransaction transaction = null;
+ LINES:
+ while ((line = buf.readLine()) != null) {
+ throwIfCancelled();
+ Matcher m;
+ m = reComment.matcher(line);
+ if (m.find()) {
+ // TODO: comments are ignored for now
+ Log.v("transaction-parser", "Ignoring comment");
+ continue;
+ }
+ //L(String.format("State is %d", updating));
+ switch (state) {
+ case EXPECTING_ACCOUNT:
+ if (line.equals("General Journal
")) {
+ state = ParserState.EXPECTING_TRANSACTION;
+ L("â expecting transaction");
+ // commit the current transaction and start a new one
+ // the account list in the UI should reflect the (committed)
+ // state of the database
+ db.setTransactionSuccessful();
+ db.endTransaction();
+ Data.accounts.setList(accountList);
+ db.beginTransaction();
+ continue;
+ }
+ m = reAccountName.matcher(line);
+ if (m.find()) {
+ String acct_encoded = m.group(1);
+ String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
+ acct_name = acct_name.replace("\"", "");
+ L(String.format("found account: %s", acct_name));
+
+ prevAccount = lastAccount;
+ lastAccount = profile.tryLoadAccount(db, acct_name);
+ if (lastAccount == null)
+ lastAccount = new LedgerAccount(acct_name);
+ else lastAccount.removeAmounts();
+ profile.storeAccount(db, lastAccount);
+
+ if (prevAccount != null) prevAccount
+ .setHasSubAccounts(prevAccount.isParentOf(lastAccount));
+ // make sure the parent account(s) are present,
+ // synthesising them if necessary
+ // this happens when the (missing-in-HTML) parent account has
+ // only one child so we create a synthetic parent account record,
+ // copying the amounts when child's amounts are parsed
+ String parentName = lastAccount.getParentName();
+ if (parentName != null) {
+ Stack toAppend = new Stack<>();
+ while (parentName != null) {
+ if (accountNames.containsKey(parentName)) break;
+ toAppend.push(parentName);
+ parentName =
+ new LedgerAccount(parentName).getParentName();
+ }
+ syntheticAccounts.clear();
+ while (!toAppend.isEmpty()) {
+ String aName = toAppend.pop();
+ LedgerAccount acc = profile.tryLoadAccount(db, aName);
+ if (acc == null) {
+ acc = new LedgerAccount(aName);
+ acc.setHiddenByStar(lastAccount.isHiddenByStar());
+ acc.setExpanded(!lastAccount.hasSubAccounts() ||
+ lastAccount.isExpanded());
+ }
+ acc.setHasSubAccounts(true);
+ acc.removeAmounts(); // filled below when amounts are parsed
+ if ((!onlyStarred || !acc.isHiddenByStar()) &&
+ acc.isVisible(accountList)) accountList.add(acc);
+ L(String.format("gap-filling with %s", aName));
+ accountNames.put(aName, null);
+ profile.storeAccount(db, acc);
+ syntheticAccounts.put(aName, acc);
+ }
}
- break;
- case ParserState.EXPECTING_TRANSACTION:
- if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
- m = transactionStartPattern.matcher(line);
- if (m.find()) {
- transactionId = Integer.valueOf(m.group(1));
- state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION;
- L(String.format(
- "found transaction %d â expecting " + "description",
- transactionId));
- progress.setProgress(++transactionCount);
- if (progress.getTotal() == Progress.INDETERMINATE)
- progress.setTotal(transactionId);
- publishProgress(progress);
+
+ if ((!onlyStarred || !lastAccount.isHiddenByStar()) &&
+ lastAccount.isVisible(accountList))
+ accountList.add(lastAccount);
+ accountNames.put(acct_name, null);
+
+ state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
+ L("â expecting account amount");
+ }
+ break;
+
+ case EXPECTING_ACCOUNT_AMOUNT:
+ m = reAccountValue.matcher(line);
+ boolean match_found = false;
+ while (m.find()) {
+ throwIfCancelled();
+
+ match_found = true;
+ String value = m.group(1);
+ String currency = m.group(2);
+ if (currency == null) currency = "";
+ value = value.replace(',', '.');
+ L("curr=" + currency + ", value=" + value);
+ final float val = Float.parseFloat(value);
+ profile.storeAccountValue(db, lastAccount.getName(), currency,
+ val);
+ lastAccount.addAmount(val, currency);
+ for (LedgerAccount syn : syntheticAccounts.values()) {
+ syn.addAmount(val, currency);
+ profile.storeAccountValue(db, syn.getName(), currency, val);
}
- m = endPattern.matcher(line);
- if (m.find()) {
- L("--- transaction list complete ---");
- success = true;
- break LINES;
+ }
+
+ if (match_found) {
+ state = ParserState.EXPECTING_ACCOUNT;
+ L("â expecting account");
+ }
+
+ break;
+
+ case EXPECTING_TRANSACTION:
+ if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
+ m = reTransactionStart.matcher(line);
+ if (m.find()) {
+ transactionId = Integer.valueOf(m.group(1));
+ state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION;
+ L(String.format("found transaction %d â expecting description",
+ transactionId));
+ progress.setProgress(++processedTransactionCount);
+ if (maxTransactionId < transactionId)
+ maxTransactionId = transactionId;
+ if ((progress.getTotal() == Progress.INDETERMINATE) ||
+ (progress.getTotal() < transactionId))
+ progress.setTotal(transactionId);
+ publishProgress(progress);
+ }
+ m = reEnd.matcher(line);
+ if (m.find()) {
+ L("--- transaction value complete ---");
+ break LINES;
+ }
+ break;
+
+ case EXPECTING_TRANSACTION_DESCRIPTION:
+ if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
+ m = reTransactionDescription.matcher(line);
+ if (m.find()) {
+ if (transactionId == 0) throw new TransactionParserException(
+ "Transaction Id is 0 while expecting " + "description");
+
+ String date = m.group(1);
+ try {
+ int equalsIndex = date.indexOf('=');
+ if (equalsIndex >= 0)
+ date = date.substring(equalsIndex + 1);
+ transaction = new LedgerTransaction(transactionId, date,
+ m.group(2));
}
- break;
- case ParserState.EXPECTING_TRANSACTION_DESCRIPTION:
- if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
- m = transactionDescriptionPattern.matcher(line);
- if (m.find()) {
- if (transactionId == 0)
- throw new TransactionParserException(
- "Transaction Id is 0 while expecting " +
- "description");
-
- transaction =
- new LedgerTransaction(transactionId, m.group(1),
- m.group(2));
- state = ParserState.EXPECTING_TRANSACTION_DETAILS;
- L(String.format("transaction %d created for %s (%s) â" +
- " expecting details", transactionId,
- m.group(1), m.group(2)));
+ catch (ParseException e) {
+ e.printStackTrace();
+ return String.format("Error parsing date '%s'", date);
+ }
+ state = ParserState.EXPECTING_TRANSACTION_DETAILS;
+ L(String.format("transaction %d created for %s (%s) â" +
+ " expecting details", transactionId, date,
+ m.group(2)));
+ }
+ break;
+
+ case EXPECTING_TRANSACTION_DETAILS:
+ if (line.isEmpty()) {
+ // transaction data collected
+ if (transaction.existsInDb(db)) {
+ profile.markTransactionAsPresent(db, transaction);
+ matchedTransactionsCount++;
+
+ if (matchedTransactionsCount ==
+ MATCHING_TRANSACTIONS_LIMIT)
+ {
+ profile.markTransactionsBeforeTransactionAsPresent(db,
+ transaction);
+ progress.setTotal(progress.getProgress());
+ publishProgress(progress);
+ break LINES;
+ }
+ }
+ else {
+ profile.storeTransaction(db, transaction);
+ matchedTransactionsCount = 0;
+ progress.setTotal(maxTransactionId);
}
- break;
- case ParserState.EXPECTING_TRANSACTION_DETAILS:
- if (line.isEmpty()) {
- // transaction data collected
- transaction.insertInto(db);
- state = ParserState.EXPECTING_TRANSACTION;
- L(String.format(
- "transaction %s saved â expecting " + "transaction",
- transaction.getId()));
+ state = ParserState.EXPECTING_TRANSACTION;
+ L(String.format("transaction %s saved â expecting transaction",
+ transaction.getId()));
+ transaction.finishLoading();
// 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
@@ -180,80 +343,292 @@ public class RetrieveTransactionsTask extends
// "parser");
// break LINES;
// }
+ }
+ else {
+ m = reTransactionDetails.matcher(line);
+ if (m.find()) {
+ String acc_name = m.group(1);
+ String amount = m.group(2);
+ String currency = m.group(3);
+ if (currency == null) currency = "";
+ amount = amount.replace(',', '.');
+ transaction.addAccount(
+ new LedgerTransactionAccount(acc_name,
+ Float.valueOf(amount), currency));
+ L(String.format("%d: %s = %s", transaction.getId(),
+ acc_name, amount));
}
- else {
- m = transactionDetailsPattern.matcher(line);
- if (m.find()) {
- String acc_name = m.group(1);
- String amount = m.group(2);
- amount = amount.replace(',', '.');
- transaction.add_item(new LedgerTransactionItem(acc_name,
- Float.valueOf(amount)));
- L(String.format("%s = %s", acc_name, amount));
- }
- else throw new IllegalStateException(
- String.format("Can't parse transaction details"));
- }
- break;
- default:
- throw new RuntimeException(
- String.format("Unknown " + "parser state %d", state));
+ else throw new IllegalStateException(String.format(
+ "Can't parse transaction %d " + "details: %s",
+ transactionId, line));
+ }
+ break;
+ default:
+ throw new RuntimeException(
+ String.format("Unknown parser updating %s", state.name()));
+ }
+ }
+
+ throwIfCancelled();
+
+ profile.deleteNotPresentTransactions(db);
+ db.setTransactionSuccessful();
+
+ profile.setLastUpdateStamp();
+
+ return null;
+ }
+ finally {
+ db.endTransaction();
+ }
+ }
+ }
+ }
+ private void prepareDbForRetrieval(SQLiteDatabase db, MobileLedgerProfile profile) {
+ db.execSQL("UPDATE transactions set keep=0 where profile=?",
+ new String[]{profile.getUuid()});
+ db.execSQL("update account_values set keep=0 where profile=?;",
+ new String[]{profile.getUuid()});
+ db.execSQL("update accounts set keep=0 where profile=?;", new String[]{profile.getUuid()});
+ }
+ private boolean retrieveAccountList(MobileLedgerProfile profile)
+ throws IOException, HTTPException {
+ Progress progress = new Progress();
+
+ HttpURLConnection http = NetworkUtil.prepareConnection(profile, "accounts");
+ http.setAllowUserInteraction(false);
+ switch (http.getResponseCode()) {
+ case 200:
+ break;
+ case 404:
+ return false;
+ default:
+ throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
+ }
+ publishProgress(progress);
+ SQLiteDatabase db = MLDB.getDatabase();
+ ArrayList accountList = new ArrayList<>();
+ boolean listFilledOK = false;
+ try (InputStream resp = http.getInputStream()) {
+ if (http.getResponseCode() != 200)
+ throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+
+ db.beginTransaction();
+ try {
+ profile.markAccountsAsNotPresent(db);
+
+ AccountListParser parser = new AccountListParser(resp);
+
+ LedgerAccount prevAccount = null;
+
+ while (true) {
+ throwIfCancelled();
+ ParsedLedgerAccount parsedAccount = parser.nextAccount();
+ if (parsedAccount == null) break;
+
+ LedgerAccount acc = profile.tryLoadAccount(db, parsedAccount.getAname());
+ if (acc == null) acc = new LedgerAccount(parsedAccount.getAname());
+ else acc.removeAmounts();
+
+ profile.storeAccount(db, acc);
+ String lastCurrency = null;
+ float lastCurrencyAmount = 0;
+ for (ParsedBalance b : parsedAccount.getAibalance()) {
+ final String currency = b.getAcommodity();
+ final float amount = b.getAquantity().asFloat();
+ if (currency.equals(lastCurrency)) lastCurrencyAmount += amount;
+ else {
+ if (lastCurrency != null) {
+ profile.storeAccountValue(db, acc.getName(), lastCurrency,
+ lastCurrencyAmount);
+ acc.addAmount(lastCurrencyAmount, lastCurrency);
}
+ lastCurrency = currency;
+ lastCurrencyAmount = amount;
+ }
+ }
+ if (lastCurrency != null) {
+ profile.storeAccountValue(db, acc.getName(), lastCurrency,
+ lastCurrencyAmount);
+ acc.addAmount(lastCurrencyAmount, lastCurrency);
+ }
+
+ if (acc.isVisible(accountList)) accountList.add(acc);
+
+ if (prevAccount != null) {
+ prevAccount.setHasSubAccounts(
+ acc.getName().startsWith(prevAccount.getName() + ":"));
+ }
+
+ prevAccount = acc;
+ }
+ throwIfCancelled();
+
+ profile.deleteNotPresentAccounts(db);
+ throwIfCancelled();
+ db.setTransactionSuccessful();
+ listFilledOK = true;
+ }
+ finally {
+ db.endTransaction();
+ }
+ }
+ // should not be set in the DB transaction, because of a possible deadlock
+ // with the main and DbOpQueueRunner threads
+ if (listFilledOK) Data.accounts.setList(accountList);
+
+ return true;
+ }
+ private boolean retrieveTransactionList(MobileLedgerProfile profile)
+ throws IOException, ParseException, HTTPException {
+ Progress progress = new Progress();
+ int maxTransactionId = Progress.INDETERMINATE;
+
+ HttpURLConnection http = NetworkUtil.prepareConnection(profile, "transactions");
+ http.setAllowUserInteraction(false);
+ publishProgress(progress);
+ switch (http.getResponseCode()) {
+ case 200:
+ break;
+ case 404:
+ return false;
+ default:
+ throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
+ }
+ SQLiteDatabase db = MLDB.getDatabase();
+ try (InputStream resp = http.getInputStream()) {
+ if (http.getResponseCode() != 200)
+ throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+ throwIfCancelled();
+ db.beginTransaction();
+ try {
+ profile.markTransactionsAsNotPresent(db);
+
+ int matchedTransactionsCount = 0;
+ TransactionListParser parser = new TransactionListParser(resp);
+
+ int processedTransactionCount = 0;
+
+ DetectedTransactionOrder transactionOrder = DetectedTransactionOrder.UNKNOWN;
+ int orderAccumulator = 0;
+ int lastTransactionId = 0;
+
+ while (true) {
+ throwIfCancelled();
+ ParsedLedgerTransaction parsedTransaction = parser.nextTransaction();
+ throwIfCancelled();
+ if (parsedTransaction == null) break;
+
+ LedgerTransaction transaction = parsedTransaction.asLedgerTransaction();
+ if (transaction.getId() > lastTransactionId) orderAccumulator++;
+ else orderAccumulator--;
+ lastTransactionId = transaction.getId();
+ if (transactionOrder == DetectedTransactionOrder.UNKNOWN) {
+ if (orderAccumulator > 30) {
+ transactionOrder = DetectedTransactionOrder.FILE;
+ Log.d("rtt", String.format(
+ "Detected native file order after %d transactions (factor %d)",
+ processedTransactionCount, orderAccumulator));
+ progress.setTotal(Data.transactions.size());
+ }
+ else if (orderAccumulator < -30) {
+ transactionOrder = DetectedTransactionOrder.REVERSE_CHRONOLOGICAL;
+ Log.d("rtt", String.format(
+ "Detected reverse chronological order after %d transactions (factor %d)",
+ processedTransactionCount, orderAccumulator));
+ }
+ }
+
+ if (transaction.existsInDb(db)) {
+ profile.markTransactionAsPresent(db, transaction);
+ matchedTransactionsCount++;
+
+ if ((transactionOrder == DetectedTransactionOrder.REVERSE_CHRONOLOGICAL) &&
+ (matchedTransactionsCount == MATCHING_TRANSACTIONS_LIMIT))
+ {
+ profile.markTransactionsBeforeTransactionAsPresent(db, transaction);
+ progress.setTotal(progress.getProgress());
+ publishProgress(progress);
+ db.setTransactionSuccessful();
+ profile.setLastUpdateStamp();
+ return true;
}
- if (!isCancelled()) db.setTransactionSuccessful();
}
- finally {
- db.endTransaction();
+ else {
+ profile.storeTransaction(db, transaction);
+ matchedTransactionsCount = 0;
+ progress.setTotal(maxTransactionId);
}
+
+
+ if ((transactionOrder != DetectedTransactionOrder.UNKNOWN) &&
+ ((progress.getTotal() == Progress.INDETERMINATE) ||
+ (progress.getTotal() < transaction.getId())))
+ progress.setTotal(transaction.getId());
+
+ progress.setProgress(++processedTransactionCount);
+ publishProgress(progress);
}
+
+ throwIfCancelled();
+ profile.deleteNotPresentTransactions(db);
+ throwIfCancelled();
+ db.setTransactionSuccessful();
+ profile.setLastUpdateStamp();
+ }
+ finally {
+ db.endTransaction();
}
}
+
+ return true;
+ }
+
+ @SuppressLint("DefaultLocale")
+ @Override
+ protected String doInBackground(Void... params) {
+ MobileLedgerProfile profile = Data.profile.get();
+ Data.backgroundTaskCount.incrementAndGet();
+ try {
+ if (!retrieveAccountList(profile) || !retrieveTransactionList(profile))
+ return retrieveTransactionListLegacy(profile);
+ return null;
+ }
catch (MalformedURLException e) {
- error = R.string.err_bad_backend_url;
e.printStackTrace();
+ return "Invalid server URL";
}
- catch (FileNotFoundException e) {
- error = R.string.err_bad_auth;
+ catch (HTTPException e) {
e.printStackTrace();
+ return String.format("HTTP error %d: %s", e.getResponseCode(), e.getResponseMessage());
}
catch (IOException e) {
- error = R.string.err_net_io_error;
e.printStackTrace();
+ return e.getLocalizedMessage();
+ }
+ catch (ParseException e) {
+ e.printStackTrace();
+ return "Network error";
+ }
+ catch (OperationCanceledException e) {
+ e.printStackTrace();
+ return "Operation cancelled";
+ }
+ finally {
+ Data.backgroundTaskCount.decrementAndGet();
}
- return null;
}
- TransactionListActivity getContext() {
+ private MainActivity getContext() {
return contextRef.get();
}
+ private void throwIfCancelled() {
+ if (isCancelled()) throw new OperationCanceledException(null);
+ }
+ enum DetectedTransactionOrder {UNKNOWN, REVERSE_CHRONOLOGICAL, FILE}
- public static class Params {
- static final int DEFAULT_LIMIT = 100;
- private SharedPreferences backendPref;
- private String accountsRoot;
- private int limit;
-
- public Params(SharedPreferences backendPref) {
- this.backendPref = backendPref;
- this.accountsRoot = null;
- this.limit = DEFAULT_LIMIT;
- }
- Params(SharedPreferences backendPref, String accountsRoot) {
- this(backendPref, accountsRoot, DEFAULT_LIMIT);
- }
- Params(SharedPreferences backendPref, String accountsRoot, int limit) {
- this.backendPref = backendPref;
- this.accountsRoot = accountsRoot;
- this.limit = limit;
- }
- String getAccountsRoot() {
- return accountsRoot;
- }
- SharedPreferences getBackendPref() {
- return backendPref;
- }
- int getLimit() {
- return limit;
- }
+ private enum ParserState {
+ EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_JOURNAL, EXPECTING_TRANSACTION,
+ EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS
}
public class Progress {
@@ -286,11 +661,4 @@ public class RetrieveTransactionsTask extends
super(message);
}
}
-
- private class ParserState {
- static final int EXPECTING_JOURNAL = 0;
- static final int EXPECTING_TRANSACTION = 1;
- static final int EXPECTING_TRANSACTION_DESCRIPTION = 2;
- static final int EXPECTING_TRANSACTION_DETAILS = 3;
- }
}