X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=178db99fb473776bf4ad5cfaf71cf45724b58001;hp=33b378450c874652bb5dd7443cb4c8ffbf317779;hb=2e6d7c5f759986f89a867ee5b9162496019d5130;hpb=98bbfc6d6604db8339f9aa5042a6740ebbd503a2 diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java index 33b37845..178db99f 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java @@ -36,21 +36,20 @@ public class UpdateTransactionsTask extends AsyncTask newList = new ArrayList<>(); - boolean hasFilter = (filterAccName != null) && (filterAccName.length > 0) && - (filterAccName[0] != null) && !filterAccName[0].isEmpty(); - String sql; String[] params; - sql = "SELECT id FROM transactions WHERE profile=? ORDER BY date desc, id desc"; - params = new String[]{profile_uuid}; + if (filterAccName[0] == null) { + sql = "SELECT id FROM transactions WHERE profile=? ORDER BY date desc, id desc"; + params = new String[]{profile_uuid}; - if (hasFilter) { + } + else { sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " + "ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile=? " + - "and ta" + ".account_name LIKE ?||'%' AND ta" + + "and ta.account_name LIKE ?||'%' AND ta" + ".amount <> 0 ORDER BY tr.date desc, tr.id desc"; - params = filterAccName; + params = new String[]{profile_uuid, filterAccName[0]}; } Log.d("UTT", sql);