From 35f7ed512ed7445362d6caee1bf60441f4ce979e Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 4 Aug 2020 09:46:38 -0300 Subject: [pos] Implement new refund API (untested since there is no wallet support) Also do a bit of code cleanup and minor refactorings This also removes the volley HTTP library which is not needed anymore --- .../src/main/java/net/taler/merchantpos/MainViewModel.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt index 905738b..5f5d534 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt @@ -19,20 +19,18 @@ package net.taler.merchantpos import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope -import com.android.volley.toolbox.Volley import net.taler.merchantlib.MerchantApi import net.taler.merchantlib.getDefaultHttpClient import net.taler.merchantpos.config.ConfigManager import net.taler.merchantpos.history.HistoryManager -import net.taler.merchantpos.history.RefundManager import net.taler.merchantpos.order.OrderManager import net.taler.merchantpos.payment.PaymentManager +import net.taler.merchantpos.refund.RefundManager class MainViewModel(app: Application) : AndroidViewModel(app) { private val httpClient = getDefaultHttpClient() private val api = MerchantApi(httpClient) - private val queue = Volley.newRequestQueue(app) val orderManager = OrderManager(app) val configManager = ConfigManager(app, viewModelScope, httpClient, api).apply { @@ -40,11 +38,10 @@ class MainViewModel(app: Application) : AndroidViewModel(app) { } val paymentManager = PaymentManager(app, configManager, viewModelScope, api) val historyManager = HistoryManager(configManager, viewModelScope, api) - val refundManager = RefundManager(configManager, queue) + val refundManager = RefundManager(configManager, viewModelScope, api) override fun onCleared() { httpClient.close() - queue.cancelAll { !it.isCanceled } } } -- cgit v1.2.3