import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.ui.activity.MainActivity;
import net.ktnx.mobileledger.utils.NetworkUtil;
import java.io.BufferedReader;
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;
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 WeakReference<MainActivity> contextRef;
// %3A is '='
private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
private Pattern reAccountValue = Pattern.compile(
"<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
private MobileLedgerProfile profile;
- public RetrieveTransactionsTask(WeakReference<MainActivity> contextRef,
- @NonNull MobileLedgerProfile profile) {
- this.contextRef = contextRef;
+ private int expectedPostingsCount = -1;
+ public RetrieveTransactionsTask(@NonNull MobileLedgerProfile profile) {
this.profile = profile;
}
private static void L(String msg) {
Data.backgroundTaskProgress.postValue(values[0]);
}
@Override
- protected void onPreExecute() {
- super.onPreExecute();
- MainActivity context = getContext();
- if (context == null)
- return;
- context.onRetrieveStart();
- }
- @Override
protected void onPostExecute(String error) {
super.onPostExecute(error);
Progress progress = new Progress();
private String retrieveTransactionListLegacy() throws IOException, HTTPException {
Progress progress = Progress.indeterminate();
progress.setState(ProgressState.RUNNING);
+ progress.setTotal(expectedPostingsCount);
int maxTransactionId = -1;
ArrayList<LedgerAccount> list = new ArrayList<>();
HashMap<String, LedgerAccount> map = new HashMap<>();
progress.setProgress(++processedTransactionCount);
if (maxTransactionId < transactionId)
maxTransactionId = transactionId;
- if ((progress.isIndeterminate()) || (progress.getTotal() < transactionId))
+ if ((progress.isIndeterminate()) ||
+ (progress.getTotal() < transactionId))
progress.setTotal(transactionId);
publishProgress(progress);
}
throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
AccountListParser parser = new AccountListParser(resp);
+ expectedPostingsCount = 0;
while (true) {
throwIfCancelled();
if (parsedAccount == null) {
break;
}
-
+ expectedPostingsCount += parsedAccount.getAnumpostings();
final String accName = parsedAccount.getAname();
LedgerAccount acc = map.get(accName);
if (acc != null)
private boolean retrieveTransactionList() throws IOException, ParseException, HTTPException {
Progress progress = new Progress();
int maxTransactionId = Data.transactions.size();
+ progress.setTotal(expectedPostingsCount);
HttpURLConnection http = NetworkUtil.prepareConnection(profile, "transactions");
http.setAllowUserInteraction(false);
TransactionListParser parser = new TransactionListParser(resp);
- int processedTransactionCount = 0;
+ int processedPostings = 0;
while (true) {
throwIfCancelled();
LedgerTransaction transaction = parsedTransaction.asLedgerTransaction();
trList.add(transaction);
- progress.setProgress(++processedTransactionCount);
+ progress.setProgress(processedPostings += transaction.getAccounts()
+ .size());
publishProgress(progress);
}
Data.backgroundTaskFinished();
}
}
- private MainActivity getContext() {
- return contextRef.get();
- }
private void throwIfCancelled() {
if (isCancelled())
throw new OperationCanceledException(null);
protected void setTotal(int total) {
this.total = total;
state = ProgressState.RUNNING;
+ indeterminate = total == -1;
}
private void ensureState(ProgressState wanted) {
if (state != wanted)