Room-based profile management

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / UpdateTransactionsTask.java

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 b6e9c3edad505f5d786a30388c0eaa26e4ede6fa..06bec67ef73d84cf6a355eac0c3d10977e562aba 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -22,9 +22,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 
 import net.ktnx.mobileledger.App;
+import net.ktnx.mobileledger.db.Profile;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.MainModel;
 import net.ktnx.mobileledger.utils.SimpleDate;
 
@@ -32,7 +32,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class UpdateTransactionsTask extends AsyncTask<MainModel, Void, String> {
     protected String doInBackground(MainModel[] model) {
-        final MobileLedgerProfile profile = Data.getProfile();
+        final Profile profile = Data.getProfile();
 
         long profile_id = profile.getId();
         Data.backgroundTaskStarted();
@@ -43,18 +43,16 @@ public class UpdateTransactionsTask extends AsyncTask<MainModel, Void, String> {
             final String accFilter = model[0].getAccountFilter()
                                              .getValue();
             if (accFilter == null) {
-                sql = "SELECT id, year, month, day FROM transactions WHERE profile=? ORDER BY " +
+                sql = "SELECT id, year, month, day FROM transactions WHERE profile_id=? ORDER BY " +
                       "year desc, month desc, day desc, id desc";
                 params = new String[]{String.valueOf(profile_id)};
 
             }
             else {
                 sql = "SELECT distinct tr.id, tr.year, tr.month, tr.day 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" +
-                      ".amount <> 0 ORDER BY tr.year desc, tr.month desc, tr.day desc, tr.id " +
-                      "desc";
+                      "JOIN transaction_accounts ta ON ta.transaction_id=tr.id WHERE tr" +
+                      ".profile_id=? and ta.account_name LIKE ?||'%' AND ta.amount <> 0 ORDER " +
+                      "BY tr.year desc, tr.month desc, tr.day desc, tr.id " + "desc";
                 params = new String[]{String.valueOf(profile_id), accFilter};
             }