X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSaveTransactionTask.java;h=913fddc5dd831bdd92a1d338ce80f7e6ddc7c53c;hp=ac9c7c91a73d116aebe715159453e6c668af2150;hb=3b365016042215dd73cb4600840aa8199b8322b9;hpb=6b740c280c79b0170321f533747cdbfc3e179a29

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
index ac9c7c91..913fddc5 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Damyan Ivanov.
+ * Copyright © 2019 Damyan Ivanov.
  * This file is part of Mobile-Ledger.
  * Mobile-Ledger is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,12 +17,12 @@
 
 package net.ktnx.mobileledger.async;
 
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.util.Log;
 
+import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.model.LedgerTransactionItem;
+import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 import net.ktnx.mobileledger.utils.UrlEncodedFormData;
 
@@ -32,7 +32,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -49,16 +48,11 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     private LedgerTransaction ltr;
     protected String error;
 
-    private SharedPreferences pref;
-    public void setPref(SharedPreferences pref) {
-        this.pref = pref;
-    }
-
     public SaveTransactionTask(TaskCallback callback) {
         task_callback = callback;
     }
     private boolean send_ok() throws IOException {
-        HttpURLConnection http = NetworkUtil.prepare_connection(pref, "add");
+        HttpURLConnection http = NetworkUtil.prepare_connection("add");
         http.setRequestMethod("POST");
         http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
         http.setRequestProperty("Accept", "*/*");
@@ -73,15 +67,11 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         if (token != null) params.add_pair("_token", token);
         params.add_pair("date", ltr.getDate());
         params.add_pair("description", ltr.getDescription());
-        {
-            Iterator<LedgerTransactionItem> items = ltr.getItemsIterator();
-            while (items.hasNext()) {
-                LedgerTransactionItem item = items.next();
-                params.add_pair("account", item.getAccountName());
-                if (item.isAmountSet())
-                    params.add_pair("amount", String.format(Locale.US, "%1.2f", item.getAmount()));
-                else params.add_pair("amount", "");
-            }
+        for (LedgerTransactionAccount acc : ltr.getAccounts()) {
+            params.add_pair("account", acc.getAccountName());
+            if (acc.isAmountSet())
+                params.add_pair("amount", String.format(Locale.US, "%1.2f", acc.getAmount()));
+            else params.add_pair("amount", "");
         }
 
         String body = params.toString();
@@ -145,7 +135,7 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     protected Void doInBackground(LedgerTransaction... ledgerTransactions) {
         error = null;
         try {
-            backend_url = pref.getString("backend_url", "");
+            backend_url = Data.profile.get().getUrl();
             ltr = ledgerTransactions[0];
 
             int tried = 0;