X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fdao%2FTransactionDAO.java;h=4032602c741abe4bd97396ead3535809315fb337;hb=860e0419d619210bb59bcae1b64d8c5db90eef70;hp=9d7fdeae4813171c7a697065c59ce2016435f843;hpb=64413271ef4ed943ae29e9cf9115c1bb77053278;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java b/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java index 9d7fdeae..4032602c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java +++ b/app/src/main/java/net/ktnx/mobileledger/dao/TransactionDAO.java @@ -17,7 +17,6 @@ package net.ktnx.mobileledger.dao; -import android.os.AsyncTask; import androidx.annotation.NonNull; import androidx.lifecycle.LiveData; @@ -79,11 +78,11 @@ public abstract class TransactionDAO extends BaseDAO { @Query("SELECT * FROM transactions WHERE id = :transactionId") public abstract TransactionWithAccounts getByIdWithAccountsSync(long transactionId); - @Query("SELECT DISTINCT description, CASE WHEN description LIKE :term||'%%' THEN 1 " + - " WHEN description LIKE '%%:'||:term||'%%' THEN 2 " + - " WHEN description LIKE '%% '||:term||'%%' THEN 3 " + + @Query("SELECT DISTINCT description, CASE WHEN description_uc LIKE :term||'%%' THEN 1 " + + " WHEN description_uc LIKE '%%:'||:term||'%%' THEN 2 " + + " WHEN description_uc LIKE '%% '||:term||'%%' THEN 3 " + " ELSE 9 END AS ordering FROM transactions " + - "WHERE description LIKE '%%'||:term||'%%' " + "ORDER BY ordering, description, rowid ") + "WHERE description_uc LIKE '%%'||:term||'%%' ORDER BY ordering, description_uc, rowid ") public abstract List lookupDescriptionSync(@NonNull String term); @androidx.room.Transaction @@ -217,7 +216,7 @@ public abstract class TransactionDAO extends BaseDAO { } } public void storeLast(TransactionWithAccounts rec) { - AsyncTask.execute(() -> appendSync(rec)); + BaseDAO.runAsync(() -> appendSync(rec)); } @androidx.room.Transaction public void appendSync(TransactionWithAccounts rec) {