package net.ktnx.mobileledger.async;
import android.annotation.SuppressLint;
-import android.os.AsyncTask;
import android.os.OperationCanceledException;
import androidx.annotation.NonNull;
import net.ktnx.mobileledger.model.LedgerAccount;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
-import net.ktnx.mobileledger.ui.MainModel;
import net.ktnx.mobileledger.utils.Logger;
import net.ktnx.mobileledger.utils.NetworkUtil;
import java.util.regex.Pattern;
-public class RetrieveTransactionsTask extends
- AsyncTask<Void, RetrieveTransactionsTask.Progress, RetrieveTransactionsTask.Result> {
+public class RetrieveTransactionsTask extends Thread {
private static final int MATCHING_TRANSACTIONS_LIMIT = 150;
private static final Pattern reComment = Pattern.compile("^\\s*;");
private static final Pattern reTransactionStart = Pattern.compile(
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 Profile profile;
private int expectedPostingsCount = -1;
- public RetrieveTransactionsTask(@NonNull MainModel mainModel, @NonNull Profile profile) {
- this.mainModel = mainModel;
+ public RetrieveTransactionsTask(@NonNull Profile profile) {
this.profile = profile;
}
private static void L(String msg) {
return null;
}
}
- @Override
- protected void onProgressUpdate(Progress... values) {
- super.onProgressUpdate(values);
- Data.backgroundTaskProgress.postValue(values[0]);
+ private void publishProgress(Progress progress) {
+ Data.backgroundTaskProgress.postValue(progress);
}
- @Override
- protected void onPostExecute(Result result) {
- super.onPostExecute(result);
+ private void finish(Result result) {
Progress progress = new Progress();
progress.setState(ProgressState.FINISHED);
progress.setError(result.error);
- onProgressUpdate(progress);
+ publishProgress(progress);
}
- @Override
- protected void onCancelled() {
- super.onCancelled();
+ private void cancel() {
Progress progress = new Progress();
progress.setState(ProgressState.FINISHED);
- onProgressUpdate(progress);
+ publishProgress(progress);
}
private void retrieveTransactionListLegacy(List<LedgerAccount> accounts,
List<LedgerTransaction> transactions)
list.add(acc);
}
throwIfCancelled();
+
+ Logger.warn("accounts",
+ String.format(Locale.US, "Got %d accounts using protocol %s", list.size(),
+ version.getDescription()));
}
return list;
return retrieveTransactionListForVersion(ver);
}
catch (Exception e) {
- Logger.debug("json",
- String.format(Locale.US, "Error during account list retrieval using API %s",
- ver.getDescription()));
+ Logger.debug("json", String.format(Locale.US,
+ "Error during transaction list retrieval using API %s",
+ ver.getDescription()), e);
}
}
}
throwIfCancelled();
+
+ Logger.warn("transactions",
+ String.format(Locale.US, "Got %d transactions using protocol %s", trList.size(),
+ apiVersion.getDescription()));
}
- // json interface returns transactions if file order and the rest of the machinery
+ // json interface returns transactions in file order and the rest of the machinery
// expects them in reverse chronological order
Collections.sort(trList, (o1, o2) -> {
int res = o2.getDate()
@SuppressLint("DefaultLocale")
@Override
- protected Result doInBackground(Void... params) {
+ public void run() {
Data.backgroundTaskStarted();
List<LedgerAccount> accounts;
List<LedgerTransaction> transactions;
Data.lastUpdateDate.postValue(new Date());
- return new Result(null);
+ finish(new Result(null));
}
catch (MalformedURLException e) {
e.printStackTrace();
- return new Result("Invalid server URL");
+ finish(new Result("Invalid server URL"));
}
catch (HTTPException e) {
e.printStackTrace();
- return new Result(
- String.format("HTTP error %d: %s", e.getResponseCode(), e.getMessage()));
+ finish(new Result(
+ String.format("HTTP error %d: %s", e.getResponseCode(), e.getMessage())));
}
catch (IOException e) {
e.printStackTrace();
- return new Result(e.getLocalizedMessage());
+ finish(new Result(e.getLocalizedMessage()));
}
catch (RuntimeJsonMappingException e) {
e.printStackTrace();
- return new Result(Result.ERR_JSON_PARSER_ERROR);
+ finish(new Result(Result.ERR_JSON_PARSER_ERROR));
}
catch (ParseException e) {
e.printStackTrace();
- return new Result("Network error");
+ finish(new Result("Network error"));
}
catch (OperationCanceledException e) {
- e.printStackTrace();
- return new Result("Operation cancelled");
+ Logger.debug("RTT", "Retrieval was cancelled", e);
+ finish(new Result(null));
}
catch (ApiNotSupportedException e) {
e.printStackTrace();
- return new Result("Server version not supported");
+ finish(new Result("Server version not supported"));
}
finally {
Data.backgroundTaskFinished();
}
}
public void throwIfCancelled() {
- if (isCancelled())
+ if (isInterrupted())
throw new OperationCanceledException(null);
}
private enum ParserState {