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=0fea3004eb211f381cdf058dc46737f36bd6b4e0;hp=4da02e823111a070efa473edcbdf8c82ab8521b3;hb=6381561a7e02eb6741536166b60cfdd74eb7ad23;hpb=e0b2d33c159281741f3a6e30975d58040a8ab879

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 4da02e82..0fea3004 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -1,18 +1,18 @@
 /*
  * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.async;
@@ -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,8 @@ import java.lang.ref.WeakReference;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -52,7 +53,7 @@ import java.util.regex.Pattern;
 
 
 public class RetrieveTransactionsTask
-        extends AsyncTask<Void, RetrieveTransactionsTask.Progress, Void> {
+        extends AsyncTask<Void, RetrieveTransactionsTask.Progress, String> {
     private static final int MATCHING_TRANSACTIONS_LIMIT = 50;
     private static final Pattern reComment = Pattern.compile("^\\s*;");
     private static final Pattern reTransactionStart = Pattern.compile("<tr class=\"title\" " +
@@ -65,7 +66,6 @@ public class RetrieveTransactionsTask
     private WeakReference<MainActivity> contextRef;
     private int error;
     // %3A is '='
-    private boolean success;
     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>");
@@ -73,7 +73,7 @@ public class RetrieveTransactionsTask
         this.contextRef = contextRef;
     }
     private static void L(String msg) {
-        Log.d("transaction-parser", msg);
+        //Log.d("transaction-parser", msg);
     }
     @Override
     protected void onProgressUpdate(Progress... values) {
@@ -90,26 +90,25 @@ 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<LedgerAccount> accountList = new ArrayList<>();
         HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;
@@ -133,8 +132,8 @@ public class RetrieveTransactionsTask
 
                         ParserState state = ParserState.EXPECTING_ACCOUNT;
                         String line;
-                        BufferedReader buf =
-                                new BufferedReader(new InputStreamReader(resp, "UTF-8"));
+                        BufferedReader buf = new BufferedReader(
+                                new InputStreamReader(resp, StandardCharsets.UTF_8));
 
                         int processedTransactionCount = 0;
                         int transactionId = 0;
@@ -248,7 +247,6 @@ public class RetrieveTransactionsTask
                                     m = reEnd.matcher(line);
                                     if (m.find()) {
                                         L("--- transaction value complete ---");
-                                        success = true;
                                         break LINES;
                                     }
                                     break;
@@ -262,13 +260,22 @@ public class RetrieveTransactionsTask
                                                     "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;
 
@@ -291,7 +298,6 @@ public class RetrieveTransactionsTask
                                                         new Object[]{profile.getUuid(),
                                                                      transaction.getId()
                                                         });
-                                                success = true;
                                                 progress.setTotal(progress.getProgress());
                                                 publishProgress(progress);
                                                 break LINES;
@@ -353,7 +359,8 @@ public class RetrieveTransactionsTask
                         Date now = new Date();
                         profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
                         Data.lastUpdateDate.set(now);
-                        TransactionListViewModel.scheduleTransactionListReload();
+
+                        return null;
                     }
                     finally {
                         db.endTransaction();
@@ -362,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();