From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Fri, 21 Dec 2018 19:39:56 +0000 (+0000)
Subject: implement parsing of account currency
X-Git-Tag: v0.3~185
X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=1bffaaa4121ae0e63453cf725b26c769b5ae0e39;p=mobile-ledger.git

implement parsing of account currency
---

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 190aa7ed..8902d455 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -50,7 +50,7 @@ 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 int error;
@@ -214,10 +214,11 @@ 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.addAccount(
                                                     new LedgerTransactionAccount(acc_name,
-                                                            Float.valueOf(amount)));
+                                                            Float.valueOf(amount), currency));
                                             L(String.format("%s = %s", acc_name, amount));
                                         }
                                         else throw new IllegalStateException(
diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
index 96cc2020..1073a88f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -118,7 +118,7 @@ public final class MLDB {
 
 class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
     public static final String DB_NAME = "mobile-ledger.db";
-    public static final int LATEST_REVISION = 9;
+    public static final int LATEST_REVISION = 10;
 
     private final Context mContext;
 
diff --git a/app/src/main/res/raw/sql_10.sql b/app/src/main/res/raw/sql_10.sql
new file mode 100644
index 00000000..48e7b790
--- /dev/null
+++ b/app/src/main/res/raw/sql_10.sql
@@ -0,0 +1,2 @@
+delete from transaction_accounts;
+delete from transactions;
\ No newline at end of file