summaryrefslogtreecommitdiff
path: root/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-07-28 17:16:57 -0300
committerTorsten Grote <t@grobox.de>2020-07-28 17:16:57 -0300
commitbc35e8924e652c323001f62f6781657545fa378f (patch)
tree2a40b28b28c2abe0aed6ca36e2c2bcaa9019c577 /merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
parent8eb241ccce345a35b05a6335d11306465220f66d (diff)
downloadtaler-android-bc35e8924e652c323001f62f6781657545fa378f.tar.gz
taler-android-bc35e8924e652c323001f62f6781657545fa378f.tar.bz2
taler-android-bc35e8924e652c323001f62f6781657545fa378f.zip
[pos] adapt history to new v1 API
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt')
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt8
1 files changed, 1 insertions, 7 deletions
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 b62c550..905738b 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
@@ -20,9 +20,6 @@ import android.app.Application
import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.viewModelScope
import com.android.volley.toolbox.Volley
-import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES
-import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
import net.taler.merchantlib.MerchantApi
import net.taler.merchantlib.getDefaultHttpClient
import net.taler.merchantpos.config.ConfigManager
@@ -35,9 +32,6 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
private val httpClient = getDefaultHttpClient()
private val api = MerchantApi(httpClient)
- private val mapper = ObjectMapper()
- .registerModule(KotlinModule())
- .configure(FAIL_ON_UNKNOWN_PROPERTIES, false)
private val queue = Volley.newRequestQueue(app)
val orderManager = OrderManager(app)
@@ -45,7 +39,7 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {
addConfigurationReceiver(orderManager)
}
val paymentManager = PaymentManager(app, configManager, viewModelScope, api)
- val historyManager = HistoryManager(configManager, queue, mapper)
+ val historyManager = HistoryManager(configManager, viewModelScope, api)
val refundManager = RefundManager(configManager, queue)
override fun onCleared() {