package net.ktnx.mobileledger.async;
import android.annotation.SuppressLint;
-import android.database.sqlite.SQLiteDatabase;
import android.os.AsyncTask;
import android.os.OperationCanceledException;
import androidx.annotation.NonNull;
-import androidx.room.Transaction;
+import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
-import net.ktnx.mobileledger.App;
import net.ktnx.mobileledger.dao.AccountDAO;
-import net.ktnx.mobileledger.dao.AccountValueDAO;
-import net.ktnx.mobileledger.dao.TransactionAccountDAO;
import net.ktnx.mobileledger.dao.TransactionDAO;
import net.ktnx.mobileledger.db.Account;
import net.ktnx.mobileledger.db.AccountWithAmounts;
import net.ktnx.mobileledger.db.DB;
import net.ktnx.mobileledger.db.Option;
import net.ktnx.mobileledger.db.Profile;
-import net.ktnx.mobileledger.db.TransactionAccount;
import net.ktnx.mobileledger.db.TransactionWithAccounts;
import net.ktnx.mobileledger.err.HTTPException;
import net.ktnx.mobileledger.json.API;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.ui.MainModel;
import net.ktnx.mobileledger.utils.Logger;
-import net.ktnx.mobileledger.utils.MLDB;
import net.ktnx.mobileledger.utils.NetworkUtil;
import java.io.BufferedReader;
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 static final String TAG = "RTT";
// %3A is '='
private final Pattern reAccountName =
Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
return retrieveAccountListForVersion(apiVersion);
}
}
- private List<LedgerAccount> retrieveAccountListAnyVersion() throws ApiNotSupportedException {
+ private List<LedgerAccount> retrieveAccountListAnyVersion()
+ throws ApiNotSupportedException, IOException, HTTPException {
for (API ver : API.allVersions) {
try {
return retrieveAccountListForVersion(ver);
}
- catch (Exception e) {
+ catch (JsonParseException | RuntimeJsonMappingException e) {
Logger.debug("json",
String.format(Locale.US, "Error during account list retrieval using API %s",
- ver.getDescription()));
+ ver.getDescription()), e);
}
}
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<>();
throwIfCancelled();
retrieveTransactionListLegacy(accounts, transactions);
}
- storeAccountsAndTransactions(accounts, transactions);
-
mainModel.updateDisplayedTransactionsFromWeb(transactions);
- return new Result(accounts, transactions);
+ new AccountAndTransactionListSaver(accounts, transactions).start();
+
+ return new Result(null);
}
catch (MalformedURLException e) {
e.printStackTrace();
Data.backgroundTaskFinished();
}
}
- @Transaction
- private void storeAccountsAndTransactions(List<LedgerAccount> accounts,
- List<LedgerTransaction> transactions) {
- AccountDAO accDao = DB.get()
- .getAccountDAO();
- TransactionDAO trDao = DB.get()
- .getTransactionDAO();
- TransactionAccountDAO trAccDao = DB.get()
- .getTransactionAccountDAO();
- AccountValueDAO valDao = DB.get()
- .getAccountValueDAO();
-
- final List<AccountWithAmounts> list = new ArrayList<>();
- for (LedgerAccount acc : accounts) {
- final AccountWithAmounts a = acc.toDBOWithAmounts();
- Account existing = accDao.getByNameSync(profile.getId(), acc.getName());
- if (existing != null) {
- a.account.setExpanded(existing.isExpanded());
- a.account.setAmountsExpanded(existing.isAmountsExpanded());
- a.account.setId(
- existing.getId()); // not strictly needed, but since we have it anyway...
- }
-
- list.add(a);
- }
- accDao.storeAccountsSync(list, profile.getId());
-
- long trGen = trDao.getGenerationSync(profile.getId());
- for (LedgerTransaction tr : transactions) {
- TransactionWithAccounts tran = tr.toDBO();
- tran.transaction.setGeneration(trGen);
- tran.transaction.setProfileId(profile.getId());
-
- tran.transaction.setId(trDao.insertSync(tran.transaction));
-
- for (TransactionAccount trAcc : tran.accounts) {
- trAcc.setGeneration(trGen);
- trAcc.setTransactionId(tran.transaction.getId());
- trAcc.setId(trAccDao.insertSync(trAcc));
- }
- }
-
- trDao.purgeOldTransactionsSync(profile.getId(), trGen);
-
- DB.get()
- .getOptionDAO()
- .insertSync(new Option(profile.getId(), MLDB.OPT_LAST_SCRAPE,
- String.valueOf((new Date()).getTime())));
- }
public void throwIfCancelled() {
if (isCancelled())
throw new OperationCanceledException(null);
this.transactions = transactions;
}
}
+
+ private class AccountAndTransactionListSaver extends Thread {
+ private final List<LedgerAccount> accounts;
+ private final List<LedgerTransaction> transactions;
+ public AccountAndTransactionListSaver(List<LedgerAccount> accounts,
+ List<LedgerTransaction> transactions) {
+ this.accounts = accounts;
+ this.transactions = transactions;
+ }
+ @Override
+ public void run() {
+ AccountDAO accDao = DB.get()
+ .getAccountDAO();
+ TransactionDAO trDao = DB.get()
+ .getTransactionDAO();
+
+ Logger.debug(TAG, "Preparing account list");
+ final List<AccountWithAmounts> list = new ArrayList<>();
+ for (LedgerAccount acc : accounts) {
+ final AccountWithAmounts a = acc.toDBOWithAmounts();
+ Account existing = accDao.getByNameSync(profile.getId(), acc.getName());
+ if (existing != null) {
+ a.account.setExpanded(existing.isExpanded());
+ a.account.setAmountsExpanded(existing.isAmountsExpanded());
+ a.account.setId(existing.getId()); // not strictly needed, but since we have it
+ // anyway...
+ }
+
+ list.add(a);
+ }
+ Logger.debug(TAG, "Account list prepared. Storing");
+ accDao.storeAccountsSync(list, profile.getId());
+ Logger.debug(TAG, "Account list stored");
+
+ Logger.debug(TAG, "Preparing transaction list");
+ final List<TransactionWithAccounts> tranList = new ArrayList<>();
+
+ for (LedgerTransaction tr : transactions)
+ tranList.add(tr.toDBO());
+
+ Logger.debug(TAG, "Storing transaction list");
+ trDao.storeTransactionsSync(tranList, profile.getId());
+
+ Logger.debug(TAG, "Transactions stored");
+
+ DB.get()
+ .getOptionDAO()
+ .insertSync(new Option(profile.getId(), Option.OPT_LAST_SCRAPE,
+ String.valueOf((new Date()).getTime())));
+ }
+ }
}
projects / mobile-ledger.git / blobdiff