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=b8a341344fb478ab5d5202173c02a1b257e26923;hp=afdef7df08887fbc6e1f0d2ee41a2a71afe32edb;hb=0bbdc409d82da31324c031f36607510f17d992e6;hpb=8cd58ae381b9c50d07cb20217f1e3823fae3906d

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 afdef7df..b8a34134 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -21,11 +21,12 @@ import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
+import android.util.Log;
 
 import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.TransactionListActivity;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionItem;
+import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
 import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 
@@ -37,6 +38,7 @@ import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -48,12 +50,12 @@ public class RetrieveTransactionsTask extends
     private static final Pattern transactionDescriptionPattern =
             Pattern.compile("<tr class=\"posting\" title=\"(\\S+)\\s(.+)");
     private static final Pattern transactionDetailsPattern =
-            Pattern.compile("^\\s+" + "(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)");
+            Pattern.compile("^\\s+" + "(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
     private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
-    protected WeakReference<TransactionListActivity> contextRef;
+    protected WeakReference<TransactionListFragment> contextRef;
     protected int error;
     private boolean success;
-    public RetrieveTransactionsTask(WeakReference<TransactionListActivity> contextRef) {
+    public RetrieveTransactionsTask(WeakReference<TransactionListFragment> contextRef) {
         this.contextRef = contextRef;
     }
     private static final void L(String msg) {
@@ -62,24 +64,31 @@ public class RetrieveTransactionsTask extends
     @Override
     protected void onProgressUpdate(Progress... values) {
         super.onProgressUpdate(values);
-        TransactionListActivity context = getContext();
+        TransactionListFragment context = getContext();
         if (context == null) return;
         context.onRetrieveProgress(values[0]);
     }
     @Override
     protected void onPreExecute() {
         super.onPreExecute();
-        TransactionListActivity context = getContext();
+        TransactionListFragment context = getContext();
         if (context == null) return;
         context.onRetrieveStart();
     }
     @Override
     protected void onPostExecute(Void aVoid) {
         super.onPostExecute(aVoid);
-        TransactionListActivity context = getContext();
+        TransactionListFragment context = getContext();
         if (context == null) return;
         context.onRetrieveDone(success);
     }
+    @Override
+    protected void onCancelled() {
+        super.onCancelled();
+        TransactionListFragment context = getContext();
+        if (context == null) return;
+        context.onRetrieveDone(false);
+    }
     @SuppressLint("DefaultLocale")
     @Override
     protected Void doInBackground(Params... params) {
@@ -91,9 +100,9 @@ public class RetrieveTransactionsTask extends
                     NetworkUtil.prepare_connection(params[0].getBackendPref(), "journal");
             http.setAllowUserInteraction(false);
             publishProgress(progress);
-            TransactionListActivity ctx = contextRef.get();
+            TransactionListFragment ctx = getContext();
             if (ctx == null) return null;
-            try (SQLiteDatabase db = MLDB.getWritableDatabase(ctx)) {
+            try (SQLiteDatabase db = MLDB.getWritableDatabase(ctx.getActivity())) {
                 try (InputStream resp = http.getInputStream()) {
                     if (http.getResponseCode() != 200) throw new IOException(
                             String.format("HTTP error %d", http.getResponseCode()));
@@ -177,6 +186,7 @@ public class RetrieveTransactionsTask extends
                                                 db.execSQL("UPDATE transactions SET keep=1 WHERE " +
                                                            "id < ?",
                                                         new Integer[]{transaction.getId()});
+                                                success = true;
                                                 progress.setTotal(progress.getProgress());
                                                 publishProgress(progress);
                                                 break LINES;
@@ -211,18 +221,21 @@ public class RetrieveTransactionsTask extends
                                         if (m.find()) {
                                             String acc_name = m.group(1);
                                             String amount = m.group(2);
+                                            String currency = m.group(3);
                                             amount = amount.replace(',', '.');
-                                            transaction.add_item(new LedgerTransactionItem(acc_name,
-                                                    Float.valueOf(amount)));
+                                            transaction.addAccount(
+                                                    new LedgerTransactionAccount(acc_name,
+                                                            Float.valueOf(amount), currency));
                                             L(String.format("%s = %s", acc_name, amount));
                                         }
                                         else throw new IllegalStateException(
-                                                String.format("Can't parse transaction details"));
+                                                String.format("Can't parse transaction %d details",
+                                                        transactionId));
                                     }
                                     break;
                                 default:
                                     throw new RuntimeException(
-                                            String.format("Unknown " + "parser state %d", state));
+                                            String.format("Unknown parser state %d", state));
                             }
                         }
                         if (!isCancelled()) {
@@ -236,7 +249,12 @@ public class RetrieveTransactionsTask extends
                 }
             }
 
-            if (success && !isCancelled()) ctx.model.reloadTransactions(ctx);
+            if (success && !isCancelled()) {
+                Log.d("db", "Updating transaction list stamp");
+                MLDB.set_option_value(ctx.getActivity(), MLDB.OPT_TRANSACTION_LIST_STAMP,
+                        new Date().getTime());
+                ctx.model.reloadTransactions(ctx);
+            }
         }
         catch (MalformedURLException e) {
             error = R.string.err_bad_backend_url;
@@ -252,7 +270,7 @@ public class RetrieveTransactionsTask extends
         }
         return null;
     }
-    TransactionListActivity getContext() {
+    TransactionListFragment getContext() {
         return contextRef.get();
     }