X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=6afe539b2ba242ac5e405e5a2624bb3dc530e678;hb=5a90fe491df28aa545df97278222b4120b56b2a7;hp=5aebe219ffa6cb9650ce15afd30719b6ce2ae150;hpb=54002a662d97289a739d3cdb9888bbab58a8064f;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 5aebe219..6afe539b 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -68,7 +68,7 @@ public class RetrieveTransactionsTask
private static final Pattern reTransactionDescription =
Pattern.compile("
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);
@@ -218,8 +217,8 @@ public class RetrieveTransactionsTask
}
acc.setHasSubAccounts(true);
acc.removeAmounts(); // filled below when amounts are parsed
- if ((!onlyStarred || !acc.isHiddenByStar()) &&
- acc.isVisible(accountList)) accountList.add(acc);
+ if (acc.isVisible(accountList))
+ accountList.add(acc);
L(String.format("gap-filling with %s", aName));
accountNames.put(aName, null);
profile.storeAccount(db, acc);
@@ -227,8 +226,7 @@ public class RetrieveTransactionsTask
}
}
- if ((!onlyStarred || !lastAccount.isHiddenByStar()) &&
- lastAccount.isVisible(accountList))
+ if (lastAccount.isVisible(accountList))
accountList.add(lastAccount);
accountNames.put(acct_name, null);
@@ -367,13 +365,14 @@ public class RetrieveTransactionsTask
else {
m = reTransactionDetails.matcher(line);
if (m.find()) {
- String acc_name = m.group(1);
- String amount = m.group(2);
- String currency = m.group(3);
+ String postingStatus = m.group(1);
+ String acc_name = m.group(2);
+ String amount = m.group(3);
+ String currency = m.group(4);
if (currency == null) currency = "";
amount = amount.replace(',', '.');
transaction.addAccount(new LedgerTransactionAccount(acc_name,
- Float.valueOf(amount), currency));
+ Float.valueOf(amount), currency, null));
L(String.format(Locale.ENGLISH, "%d: %s = %s",
transaction.getId(), acc_name, amount));
}