X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=1d69fa2941a1f0963f5857c560f15bf244e2d751;hp=b0d423fd2f9545bb195bd18a308b85a85319dfc4;hb=20c03b7a5eb152d42fbbe9ecbaae27530563b398;hpb=53c1e0adfd08bd4a6f36bf3fa7b6e52d968c927d

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 b0d423fd..1d69fa29 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -1,296 +1,675 @@
 /*
- * 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 © 2020 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 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.util.Log;
+import android.os.OperationCanceledException;
 
-import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.TransactionListActivity;
+import androidx.annotation.NonNull;
+
+import net.ktnx.mobileledger.App;
+import net.ktnx.mobileledger.err.HTTPException;
+import net.ktnx.mobileledger.json.v1_15.AccountListParser;
+import net.ktnx.mobileledger.json.v1_15.ParsedBalance;
+import net.ktnx.mobileledger.json.v1_15.ParsedLedgerAccount;
+import net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction;
+import net.ktnx.mobileledger.json.v1_15.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.utils.MobileLedgerDatabase;
+import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.MainModel;
 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.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
 public class RetrieveTransactionsTask extends
-        AsyncTask<RetrieveTransactionsTask.Params, RetrieveTransactionsTask.Progress, Void> {
-    private static final Pattern transactionStartPattern = Pattern.compile("<tr class=\"title\" " +
-                                                                           "id=\"transaction-(\\d+)\"><td class=\"date\"[^\\\"]*>([\\d.-]+)</td>");
-    private static final Pattern transactionDescriptionPattern =
+        AsyncTask<Void, RetrieveTransactionsTask.Progress, RetrieveTransactionsTask.Result> {
+    private static final int MATCHING_TRANSACTIONS_LIMIT = 150;
+    private static final Pattern reComment = Pattern.compile("^\\s*;");
+    private static final Pattern reTransactionStart = Pattern.compile(
+            "<tr class=\"title\" " + "id=\"transaction-(\\d+)" + "\"><td class=\"date" +
+            "\"[^\"]*>([\\d.-]+)</td>");
+    private static final Pattern reTransactionDescription =
             Pattern.compile("<tr class=\"posting\" title=\"(\\S+)\\s(.+)");
-    private static final Pattern transactionDetailsPattern =
-            Pattern.compile("^\\s+" + "(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)");
-    private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
-    protected WeakReference<TransactionListActivity> contextRef;
-    protected int error;
-    private boolean success;
-    public RetrieveTransactionsTask(WeakReference<TransactionListActivity> contextRef) {
-        this.contextRef = contextRef;
+    private static final Pattern reTransactionDetails = Pattern.compile(
+            "^\\s+" + "([!*]\\s+)?" + "(\\S[\\S\\s]+\\S)\\s\\s+" + "(?:([^\\d\\s+\\-]+)\\s*)?" +
+            "([-+]?\\d[\\d,.]*)" + "(?:\\s*([^\\d\\s+\\-]+)\\s*$)?");
+    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?$");
+    // %3A is '='
+    private final Pattern reAccountName =
+            Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+    private final Pattern reAccountValue = Pattern.compile(
+            "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
+    private final MainModel mainModel;
+    private final MobileLedgerProfile profile;
+    private final List<LedgerAccount> prevAccounts;
+    private int expectedPostingsCount = -1;
+    public RetrieveTransactionsTask(@NonNull MainModel mainModel,
+                                    @NonNull MobileLedgerProfile profile,
+                                    List<LedgerAccount> accounts) {
+        this.mainModel = mainModel;
+        this.profile = profile;
+        this.prevAccounts = accounts;
     }
-    private static final void L(String msg) {
-        Log.d("transaction-parser", msg);
+    private static void L(String msg) {
+        //debug("transaction-parser", msg);
+    }
+    static LedgerTransactionAccount parseTransactionAccountLine(String line) {
+        Matcher m = reTransactionDetails.matcher(line);
+        if (m.find()) {
+            String postingStatus = m.group(1);
+            String acc_name = m.group(2);
+            String currencyPre = m.group(3);
+            String amount = Objects.requireNonNull(m.group(4));
+            String currencyPost = m.group(5);
+
+            String currency = null;
+            if ((currencyPre != null) && (currencyPre.length() > 0)) {
+                if ((currencyPost != null) && (currencyPost.length() > 0))
+                    return null;
+                currency = currencyPre;
+            }
+            else if ((currencyPost != null) && (currencyPost.length() > 0)) {
+                currency = currencyPost;
+            }
+
+            amount = amount.replace(',', '.');
+
+            return new LedgerTransactionAccount(acc_name, Float.parseFloat(amount), currency, null);
+        }
+        else {
+            return null;
+        }
     }
     @Override
     protected void onProgressUpdate(Progress... values) {
         super.onProgressUpdate(values);
-        TransactionListActivity context = getContext();
-        if (context == null) return;
-        context.onRetrieveProgress(values[0]);
+        Data.backgroundTaskProgress.postValue(values[0]);
     }
     @Override
-    protected void onPreExecute() {
-        super.onPreExecute();
-        TransactionListActivity context = getContext();
-        if (context == null) return;
-        context.onRetrieveStart();
+    protected void onPostExecute(Result result) {
+        super.onPostExecute(result);
+        Progress progress = new Progress();
+        progress.setState(ProgressState.FINISHED);
+        progress.setError(result.error);
+        onProgressUpdate(progress);
     }
     @Override
-    protected void onPostExecute(Void aVoid) {
-        super.onPostExecute(aVoid);
-        TransactionListActivity context = getContext();
-        if (context == null) return;
-        context.onRetrieveDone(success);
-    }
-    @SuppressLint("DefaultLocale")
-    @Override
-    protected Void doInBackground(Params... params) {
+    protected void onCancelled() {
+        super.onCancelled();
         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 (MobileLedgerDatabase dbh = new MobileLedgerDatabase(ctx)) {
-                try (SQLiteDatabase db = dbh.getWritableDatabase()) {
-                    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;
-                                if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
-                                Matcher m;
-                                //L(String.format("State is %d", state));
-                                switch (state) {
-                                    case ParserState.EXPECTING_JOURNAL:
-                                        if (line.equals("<h2>General Journal</h2>")) {
-                                            state = ParserState.EXPECTING_TRANSACTION;
-                                            L("→ expecting transaction");
-                                        }
-                                        break;
-                                    case ParserState.EXPECTING_TRANSACTION:
-                                        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);
-                                        }
-                                        m = endPattern.matcher(line);
-                                        if (m.find()) {
-                                            L("--- transaction list complete ---");
-                                            success = true;
-                                            break LINES;
-                                        }
-                                        break;
-                                    case ParserState.EXPECTING_TRANSACTION_DESCRIPTION:
-                                        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)));
-                                        }
-                                        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()));
+        progress.setState(ProgressState.FINISHED);
+        onProgressUpdate(progress);
+    }
+    private void retrieveTransactionListLegacy(List<LedgerAccount> accounts,
+                                               List<LedgerTransaction> transactions)
+            throws IOException, HTTPException {
+        Progress progress = Progress.indeterminate();
+        progress.setState(ProgressState.RUNNING);
+        progress.setTotal(expectedPostingsCount);
+        int maxTransactionId = -1;
+        HashMap<String, LedgerAccount> map = new HashMap<>();
+        LedgerAccount lastAccount = null;
+        ArrayList<LedgerAccount> syntheticAccounts = new ArrayList<>();
+
+        HttpURLConnection http = NetworkUtil.prepareConnection(profile, "journal");
+        http.setAllowUserInteraction(false);
+        publishProgress(progress);
+        if (http.getResponseCode() != 200)
+            throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
+
+        try (InputStream resp = http.getInputStream()) {
+            if (http.getResponseCode() != 200)
+                throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+
+            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("<h2>General Journal</h2>")) {
+                            state = ParserState.EXPECTING_TRANSACTION;
+                            L("→ expecting transaction");
+                            continue;
+                        }
+                        m = reAccountName.matcher(line);
+                        if (m.find()) {
+                            String acct_encoded = m.group(1);
+                            String accName = URLDecoder.decode(acct_encoded, "UTF-8");
+                            accName = accName.replace("\"", "");
+                            L(String.format("found account: %s", accName));
+
+                            lastAccount = map.get(accName);
+                            if (lastAccount != null) {
+                                L(String.format("ignoring duplicate account '%s'", accName));
+                                continue;
+                            }
+                            String parentAccountName = LedgerAccount.extractParentName(accName);
+                            LedgerAccount parentAccount;
+                            if (parentAccountName != null) {
+                                parentAccount = ensureAccountExists(parentAccountName, map,
+                                        syntheticAccounts);
+                            }
+                            else {
+                                parentAccount = null;
+                            }
+                            lastAccount = new LedgerAccount(profile, accName, parentAccount);
+
+                            accounts.add(lastAccount);
+                            map.put(accName, lastAccount);
+
+                            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 = Objects.requireNonNull(m.group(1));
+                            String currency = m.group(2);
+                            if (currency == null)
+                                currency = "";
+
+                            {
+                                Matcher tmpM = reDecimalComma.matcher(value);
+                                if (tmpM.find()) {
+                                    value = value.replace(".", "");
+                                    value = value.replace(',', '.');
+                                }
+
+                                tmpM = reDecimalPoint.matcher(value);
+                                if (tmpM.find()) {
+                                    value = value.replace(",", "");
+                                    value = value.replace(" ", "");
+                                }
+                            }
+                            L("curr=" + currency + ", value=" + value);
+                            final float val = Float.parseFloat(value);
+                            lastAccount.addAmount(val, currency);
+                            for (LedgerAccount syn : syntheticAccounts) {
+                                L(String.format(Locale.ENGLISH, "propagating %s %1.2f to %s",
+                                        currency, val, syn.getName()));
+                                syn.addAmount(val, currency);
+                            }
+                        }
+
+                        if (match_found) {
+                            syntheticAccounts.clear();
+                            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.parseInt(Objects.requireNonNull(m.group(1)));
+                            state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION;
+                            L(String.format(Locale.ENGLISH,
+                                    "found transaction %d → expecting description", transactionId));
+                            progress.setProgress(++processedTransactionCount);
+                            if (maxTransactionId < transactionId)
+                                maxTransactionId = transactionId;
+                            if ((progress.isIndeterminate()) ||
+                                (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 = Objects.requireNonNull(m.group(1));
+                            try {
+                                int equalsIndex = date.indexOf('=');
+                                if (equalsIndex >= 0)
+                                    date = date.substring(equalsIndex + 1);
+                                transaction =
+                                        new LedgerTransaction(transactionId, date, m.group(2));
+                            }
+                            catch (ParseException e) {
+                                throw new TransactionParserException(
+                                        String.format("Error parsing date '%s'", date));
+                            }
+                            state = ParserState.EXPECTING_TRANSACTION_DETAILS;
+                            L(String.format(Locale.ENGLISH,
+                                    "transaction %d created for %s (%s) →" + " expecting details",
+                                    transactionId, date, m.group(2)));
+                        }
+                        break;
+
+                    case EXPECTING_TRANSACTION_DETAILS:
+                        if (line.isEmpty()) {
+                            // transaction data collected
+
+                            transaction.finishLoading();
+                            transactions.add(transaction);
+
+                            state = ParserState.EXPECTING_TRANSACTION;
+                            L(String.format("transaction %s parsed → expecting transaction",
+                                    transaction.getId()));
 
 // 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
 //                                            if (transactionId == 1) {
-//                                                L("This was the initial transaction. Terminating " +
+//                                                L("This was the initial transaction.
+//                                                Terminating " +
 //                                                  "parser");
 //                                                break LINES;
 //                                            }
-                                        }
-                                        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 {
+                            LedgerTransactionAccount lta = parseTransactionAccountLine(line);
+                            if (lta != null) {
+                                transaction.addAccount(lta);
+                                L(String.format(Locale.ENGLISH, "%d: %s = %s", transaction.getId(),
+                                        lta.getAccountName(), lta.getAmount()));
                             }
-                            if (!isCancelled()) db.setTransactionSuccessful();
+                            else
+                                throw new IllegalStateException(
+                                        String.format("Can't parse transaction %d details: %s",
+                                                transactionId, line));
                         }
-                        finally {
-                            db.endTransaction();
+                        break;
+                    default:
+                        throw new RuntimeException(
+                                String.format("Unknown parser updating %s", state.name()));
+                }
+            }
+
+            throwIfCancelled();
+        }
+    }
+    private @NonNull
+    LedgerAccount ensureAccountExists(String accountName, HashMap<String, LedgerAccount> map,
+                                      ArrayList<LedgerAccount> createdAccounts) {
+        LedgerAccount acc = map.get(accountName);
+
+        if (acc != null)
+            return acc;
+
+        String parentName = LedgerAccount.extractParentName(accountName);
+        LedgerAccount parentAccount;
+        if (parentName != null) {
+            parentAccount = ensureAccountExists(parentName, map, createdAccounts);
+        }
+        else {
+            parentAccount = null;
+        }
+
+        acc = new LedgerAccount(profile, accountName, parentAccount);
+        createdAccounts.add(acc);
+        return acc;
+    }
+    private List<LedgerAccount> retrieveAccountList() throws IOException, HTTPException {
+        HttpURLConnection http = NetworkUtil.prepareConnection(profile, "accounts");
+        http.setAllowUserInteraction(false);
+        switch (http.getResponseCode()) {
+            case 200:
+                break;
+            case 404:
+                return null;
+            default:
+                throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
+        }
+        publishProgress(Progress.indeterminate());
+        SQLiteDatabase db = App.getDatabase();
+        ArrayList<LedgerAccount> list = new ArrayList<>();
+        HashMap<String, LedgerAccount> map = new HashMap<>();
+        HashMap<String, LedgerAccount> currentMap = new HashMap<>();
+        for (LedgerAccount acc : prevAccounts)
+            currentMap.put(acc.getName(), acc);
+        throwIfCancelled();
+        try (InputStream resp = http.getInputStream()) {
+            throwIfCancelled();
+            if (http.getResponseCode() != 200)
+                throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+
+            AccountListParser parser = new AccountListParser(resp);
+            expectedPostingsCount = 0;
+
+            while (true) {
+                throwIfCancelled();
+                ParsedLedgerAccount parsedAccount = parser.nextAccount();
+                if (parsedAccount == null) {
+                    break;
+                }
+                expectedPostingsCount += parsedAccount.getAnumpostings();
+                final String accName = parsedAccount.getAname();
+                LedgerAccount acc = map.get(accName);
+                if (acc != null)
+                    throw new RuntimeException(
+                            String.format("Account '%s' already present", acc.getName()));
+                String parentName = LedgerAccount.extractParentName(accName);
+                ArrayList<LedgerAccount> createdParents = new ArrayList<>();
+                LedgerAccount parent;
+                if (parentName == null) {
+                    parent = null;
+                }
+                else {
+                    parent = ensureAccountExists(parentName, map, createdParents);
+                    parent.setHasSubAccounts(true);
+                }
+                acc = new LedgerAccount(profile, accName, parent);
+                list.add(acc);
+                map.put(accName, acc);
+
+                String lastCurrency = null;
+                float lastCurrencyAmount = 0;
+                for (ParsedBalance b : parsedAccount.getAibalance()) {
+                    throwIfCancelled();
+                    final String currency = b.getAcommodity();
+                    final float amount = b.getAquantity()
+                                          .asFloat();
+                    if (currency.equals(lastCurrency)) {
+                        lastCurrencyAmount += amount;
+                    }
+                    else {
+                        if (lastCurrency != null) {
+                            acc.addAmount(lastCurrencyAmount, lastCurrency);
                         }
+                        lastCurrency = currency;
+                        lastCurrencyAmount = amount;
                     }
                 }
+                if (lastCurrency != null) {
+                    acc.addAmount(lastCurrencyAmount, lastCurrency);
+                }
+                for (LedgerAccount p : createdParents)
+                    acc.propagateAmountsTo(p);
             }
+            throwIfCancelled();
         }
-        catch (MalformedURLException e) {
-            error = R.string.err_bad_backend_url;
-            e.printStackTrace();
+
+        // 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());
+            }
         }
-        catch (FileNotFoundException e) {
-            error = R.string.err_bad_auth;
-            e.printStackTrace();
+
+        return list;
+    }
+    private List<LedgerTransaction> retrieveTransactionList()
+            throws IOException, ParseException, HTTPException {
+        Progress progress = new Progress();
+        progress.setTotal(expectedPostingsCount);
+
+        HttpURLConnection http = NetworkUtil.prepareConnection(profile, "transactions");
+        http.setAllowUserInteraction(false);
+        publishProgress(progress);
+        switch (http.getResponseCode()) {
+            case 200:
+                break;
+            case 404:
+                return null;
+            default:
+                throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
         }
-        catch (IOException e) {
-            error = R.string.err_net_io_error;
-            e.printStackTrace();
+        ArrayList<LedgerTransaction> trList = new ArrayList<>();
+        try (InputStream resp = http.getInputStream()) {
+            throwIfCancelled();
+
+            TransactionListParser parser = new TransactionListParser(resp);
+
+            int processedPostings = 0;
+
+            while (true) {
+                throwIfCancelled();
+                ParsedLedgerTransaction parsedTransaction = parser.nextTransaction();
+                throwIfCancelled();
+                if (parsedTransaction == null)
+                    break;
+
+                LedgerTransaction transaction = parsedTransaction.asLedgerTransaction();
+                trList.add(transaction);
+
+                progress.setProgress(processedPostings += transaction.getAccounts()
+                                                                     .size());
+//                Logger.debug("trParser",
+//                        String.format(Locale.US, "Parsed transaction %d - %s", transaction
+//                        .getId(),
+//                                transaction.getDescription()));
+//                for (LedgerTransactionAccount acc : transaction.getAccounts()) {
+//                    Logger.debug("trParser",
+//                            String.format(Locale.US, "  %s", acc.getAccountName()));
+//                }
+                publishProgress(progress);
+            }
+
+            throwIfCancelled();
         }
-        return null;
-    }
-    TransactionListActivity getContext() {
-        return contextRef.get();
+
+        // json interface returns transactions if file order and the rest of the machinery
+        // expects them in reverse chronological order
+        Collections.sort(trList, (o1, o2) -> {
+            int res = o2.getDate()
+                        .compareTo(o1.getDate());
+            if (res != 0)
+                return res;
+            return Integer.compare(o2.getId(), o1.getId());
+        });
+        return trList;
     }
 
-    public static class Params {
-        static final int DEFAULT_LIMIT = 100;
-        private SharedPreferences backendPref;
-        private String accountsRoot;
-        private int limit;
+    @SuppressLint("DefaultLocale")
+    @Override
+    protected Result doInBackground(Void... params) {
+        Data.backgroundTaskStarted();
+        List<LedgerAccount> accounts;
+        List<LedgerTransaction> transactions;
+        try {
+            accounts = retrieveAccountList();
+            if (accounts == null)
+                transactions = null;
+            else
+                transactions = retrieveTransactionList();
+            if (accounts == null || transactions == null) {
+                accounts = new ArrayList<>();
+                transactions = new ArrayList<>();
+                retrieveTransactionListLegacy(accounts, transactions);
+            }
+            mainModel.setAndStoreAccountAndTransactionListFromWeb(accounts, transactions);
 
-        public Params(SharedPreferences backendPref) {
-            this.backendPref = backendPref;
-            this.accountsRoot = null;
-            this.limit = DEFAULT_LIMIT;
+            return new Result(accounts, transactions);
         }
-        Params(SharedPreferences backendPref, String accountsRoot) {
-            this(backendPref, accountsRoot, DEFAULT_LIMIT);
+        catch (MalformedURLException e) {
+            e.printStackTrace();
+            return new Result("Invalid server URL");
         }
-        Params(SharedPreferences backendPref, String accountsRoot, int limit) {
-            this.backendPref = backendPref;
-            this.accountsRoot = accountsRoot;
-            this.limit = limit;
+        catch (HTTPException e) {
+            e.printStackTrace();
+            return new Result(String.format("HTTP error %d: %s", e.getResponseCode(),
+                    e.getResponseMessage()));
         }
-        String getAccountsRoot() {
-            return accountsRoot;
+        catch (IOException e) {
+            e.printStackTrace();
+            return new Result(e.getLocalizedMessage());
+        }
+        catch (ParseException e) {
+            e.printStackTrace();
+            return new Result("Network error");
         }
-        SharedPreferences getBackendPref() {
-            return backendPref;
+        catch (OperationCanceledException e) {
+            e.printStackTrace();
+            return new Result("Operation cancelled");
         }
-        int getLimit() {
-            return limit;
+        finally {
+            Data.backgroundTaskFinished();
         }
     }
+    private void throwIfCancelled() {
+        if (isCancelled())
+            throw new OperationCanceledException(null);
+    }
+    private enum ParserState {
+        EXPECTING_ACCOUNT, EXPECTING_ACCOUNT_AMOUNT, EXPECTING_TRANSACTION,
+        EXPECTING_TRANSACTION_DESCRIPTION, EXPECTING_TRANSACTION_DETAILS
+    }
+
+    public enum ProgressState {STARTING, RUNNING, FINISHED}
 
-    public class Progress {
-        public static final int INDETERMINATE = -1;
+    public static class Progress {
         private int progress;
         private int total;
+        private ProgressState state = ProgressState.RUNNING;
+        private String error = null;
+        private boolean indeterminate;
         Progress() {
-            this(INDETERMINATE, INDETERMINATE);
+            indeterminate = true;
         }
         Progress(int progress, int total) {
+            this.indeterminate = false;
             this.progress = progress;
             this.total = total;
         }
+        public static Progress indeterminate() {
+            return new Progress();
+        }
+        public static Progress finished(String error) {
+            Progress p = new Progress();
+            p.setState(ProgressState.FINISHED);
+            p.setError(error);
+            return p;
+        }
         public int getProgress() {
+            ensureState(ProgressState.RUNNING);
             return progress;
         }
         protected void setProgress(int progress) {
             this.progress = progress;
+            this.state = ProgressState.RUNNING;
         }
         public int getTotal() {
+            ensureState(ProgressState.RUNNING);
             return total;
         }
         protected void setTotal(int total) {
             this.total = total;
+            state = ProgressState.RUNNING;
+            indeterminate = total == -1;
+        }
+        private void ensureState(ProgressState wanted) {
+            if (state != wanted)
+                throw new IllegalStateException(
+                        String.format("Bad state: %s, expected %s", state, wanted));
+        }
+        public ProgressState getState() {
+            return state;
+        }
+        public void setState(ProgressState state) {
+            this.state = state;
+        }
+        public String getError() {
+            ensureState(ProgressState.FINISHED);
+            return error;
+        }
+        public void setError(String error) {
+            this.error = error;
+            state = ProgressState.FINISHED;
+        }
+        public boolean isIndeterminate() {
+            return indeterminate;
+        }
+        public void setIndeterminate(boolean indeterminate) {
+            this.indeterminate = indeterminate;
         }
     }
 
-    private class TransactionParserException extends IllegalStateException {
+    private static class TransactionParserException extends IllegalStateException {
         TransactionParserException(String message) {
             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;
+    public static class Result {
+        public String error;
+        public List<LedgerAccount> accounts;
+        public List<LedgerTransaction> transactions;
+        Result(String error) {
+            this.error = error;
+        }
+        Result(List<LedgerAccount> accounts, List<LedgerTransaction> transactions) {
+            this.accounts = accounts;
+            this.transactions = transactions;
+        }
     }
 }