X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=56a26621e24b120e2e3b86789ae5c1eb03b95f06;hp=91ea8ffc55bfe394df8b7001c9d9b7ea90b76b9b;hb=ea17ca9e3b03ca0090be03fdc0abbbbfd954be89;hpb=2e6d7c5f759986f89a867ee5b9162496019d5130 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 91ea8ffc..56a26621 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -23,7 +23,6 @@ import android.os.AsyncTask; import android.os.OperationCanceledException; import android.util.Log; -import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerAccount; import net.ktnx.mobileledger.model.LedgerTransaction; @@ -43,6 +42,7 @@ import java.lang.ref.WeakReference; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URLDecoder; +import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -52,22 +52,21 @@ import java.util.regex.Pattern; public class RetrieveTransactionsTask - extends AsyncTask { + extends AsyncTask { private static final int MATCHING_TRANSACTIONS_LIMIT = 50; - private static final Pattern commentPattern = Pattern.compile("^\\s*;"); - private static final Pattern transactionStartPattern = Pattern.compile("([\\d.-]+)"); - private static final Pattern transactionDescriptionPattern = + private static final Pattern reComment = Pattern.compile("^\\s*;"); + private static final Pattern reTransactionStart = Pattern.compile("([\\d.-]+)"); + private static final Pattern reTransactionDescription = Pattern.compile(" contextRef; private int error; // %3A is '=' - private boolean success; - private Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\""); - private Pattern account_value_re = Pattern.compile( + private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\""); + private Pattern reAccountValue = Pattern.compile( "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?"); public RetrieveTransactionsTask(WeakReference contextRef) { this.contextRef = contextRef; @@ -90,34 +89,32 @@ public class RetrieveTransactionsTask context.onRetrieveStart(); } @Override - protected void onPostExecute(Void aVoid) { - super.onPostExecute(aVoid); + protected void onPostExecute(String error) { + super.onPostExecute(error); MainActivity context = getContext(); if (context == null) return; - context.onRetrieveDone(success); + context.onRetrieveDone(error); } @Override protected void onCancelled() { super.onCancelled(); MainActivity context = getContext(); if (context == null) return; - context.onRetrieveDone(false); + context.onRetrieveDone(null); } @SuppressLint("DefaultLocale") @Override - protected Void doInBackground(Void... params) { + protected String doInBackground(Void... params) { MobileLedgerProfile profile = Data.profile.get(); Progress progress = new Progress(); int maxTransactionId = Progress.INDETERMINATE; - success = false; ArrayList accountList = new ArrayList<>(); - ArrayList transactionList = new ArrayList<>(); HashMap accountNames = new HashMap<>(); LedgerAccount lastAccount = null; boolean onlyStarred = Data.optShowOnlyStarred.get(); Data.backgroundTaskCount.incrementAndGet(); try { - HttpURLConnection http = NetworkUtil.prepare_connection("journal"); + HttpURLConnection http = NetworkUtil.prepareConnection("journal"); http.setAllowUserInteraction(false); publishProgress(progress); MainActivity ctx = getContext(); @@ -145,7 +142,7 @@ public class RetrieveTransactionsTask while ((line = buf.readLine()) != null) { throwIfCancelled(); Matcher m; - m = commentPattern.matcher(line); + m = reComment.matcher(line); if (m.find()) { // TODO: comments are ignored for now Log.v("transaction-parser", "Ignoring comment"); @@ -160,7 +157,7 @@ public class RetrieveTransactionsTask Data.accounts.set(accountList); continue; } - m = account_name_re.matcher(line); + m = reAccountName.matcher(line); if (m.find()) { String acct_encoded = m.group(1); String acct_name = URLDecoder.decode(acct_encoded, "UTF-8"); @@ -206,7 +203,7 @@ public class RetrieveTransactionsTask break; case EXPECTING_ACCOUNT_AMOUNT: - m = account_value_re.matcher(line); + m = reAccountValue.matcher(line); boolean match_found = false; while (m.find()) { throwIfCancelled(); @@ -231,7 +228,7 @@ public class RetrieveTransactionsTask case EXPECTING_TRANSACTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = transactionStartPattern.matcher(line); + m = reTransactionStart.matcher(line); if (m.find()) { transactionId = Integer.valueOf(m.group(1)); state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION; @@ -246,30 +243,38 @@ public class RetrieveTransactionsTask progress.setTotal(transactionId); publishProgress(progress); } - m = endPattern.matcher(line); + m = reEnd.matcher(line); if (m.find()) { L("--- transaction value complete ---"); - success = true; break LINES; } break; case EXPECTING_TRANSACTION_DESCRIPTION: if (!line.isEmpty() && (line.charAt(0) == ' ')) continue; - m = transactionDescriptionPattern.matcher(line); + m = reTransactionDescription.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)); + String date = 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) { + e.printStackTrace(); + return String.format("Error parsing date '%s'", date); + } state = ParserState.EXPECTING_TRANSACTION_DETAILS; L(String.format("transaction %d created for %s (%s) →" + - " expecting details", transactionId, - m.group(1), m.group(2))); + " expecting details", transactionId, date, + m.group(2))); } break; @@ -292,7 +297,6 @@ public class RetrieveTransactionsTask new Object[]{profile.getUuid(), transaction.getId() }); - success = true; progress.setTotal(progress.getProgress()); publishProgress(progress); break LINES; @@ -309,7 +313,6 @@ public class RetrieveTransactionsTask "transaction %s saved → expecting transaction", transaction.getId())); transaction.finishLoading(); - transactionList.add(transaction); // 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 @@ -320,7 +323,7 @@ public class RetrieveTransactionsTask // } } else { - m = transactionDetailsPattern.matcher(line); + m = reTransactionDetails.matcher(line); if (m.find()) { String acc_name = m.group(1); String amount = m.group(2); @@ -353,9 +356,11 @@ public class RetrieveTransactionsTask Log.d("db", "Updating transaction value stamp"); Date now = new Date(); - profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime()); + profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime()); Data.lastUpdateDate.set(now); TransactionListViewModel.scheduleTransactionListReload(); + + return null; } finally { db.endTransaction(); @@ -364,25 +369,24 @@ public class RetrieveTransactionsTask } } catch (MalformedURLException e) { - error = R.string.err_bad_backend_url; e.printStackTrace(); + return "Invalid server URL"; } catch (FileNotFoundException e) { - error = R.string.err_bad_auth; e.printStackTrace(); + return "Invalid user name or password"; } catch (IOException e) { - error = R.string.err_net_io_error; e.printStackTrace(); + return "Network error"; } catch (OperationCanceledException e) { - error = R.string.err_cancelled; e.printStackTrace(); + return "Operation cancelled"; } finally { Data.backgroundTaskCount.decrementAndGet(); } - return null; } private MainActivity getContext() { return contextRef.get();