X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=701ec506896d19b53be9576e84ed0ae45b588f9e;hb=aa4c87766cd8ba1c16ff39d16e34881f0430d52c;hp=afdef7df08887fbc6e1f0d2ee41a2a71afe32edb;hpb=8cd58ae381b9c50d07cb20217f1e3823fae3906d;p=mobile-ledger-staging.git
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..701ec506 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.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,7 +50,7 @@ public class RetrieveTransactionsTask extends
private static final Pattern transactionDescriptionPattern =
Pattern.compile("
contextRef;
protected int error;
@@ -80,6 +82,13 @@ public class RetrieveTransactionsTask extends
if (context == null) return;
context.onRetrieveDone(success);
}
+ @Override
+ protected void onCancelled() {
+ super.onCancelled();
+ TransactionListActivity context = getContext();
+ if (context == null) return;
+ context.onRetrieveDone(false);
+ }
@SuppressLint("DefaultLocale")
@Override
protected Void doInBackground(Params... params) {
@@ -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,11 @@ 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, MLDB.OPT_TRANSACTION_LIST_STAMP, new Date().getTime());
+ ctx.model.reloadTransactions(ctx);
+ }
}
catch (MalformedURLException e) {
error = R.string.err_bad_backend_url;