From 8562b15381d99e5c1a5c15a64dd124d04b2fab6a Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 31 Jul 2020 08:35:36 -0300 Subject: Remove left-over class from libraryfication (fixes release builds) --- wallet/src/main/java/net/taler/wallet/MainViewModel.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wallet/src/main/java/net/taler/wallet') diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt index ffa2dea..2c5e318 100644 --- a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt +++ b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt @@ -24,7 +24,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.distinctUntilChanged import androidx.lifecycle.viewModelScope -import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.KotlinModule @@ -32,6 +31,8 @@ import com.fasterxml.jackson.module.kotlin.readValue import net.taler.common.Amount import net.taler.common.AmountMixin import net.taler.common.Event +import net.taler.common.Timestamp +import net.taler.common.TimestampMixin import net.taler.common.assertUiThread import net.taler.common.toEvent import net.taler.wallet.backend.WalletBackendApi @@ -95,7 +96,7 @@ class MainViewModel(val app: Application) : AndroidViewModel(app) { .registerModule(KotlinModule()) .configure(FAIL_ON_UNKNOWN_PROPERTIES, false) .addMixIn(Amount::class.java, AmountMixin::class.java) - .enable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT) + .addMixIn(Timestamp::class.java, TimestampMixin::class.java) val withdrawManager = WithdrawManager(walletBackendApi, mapper) val paymentManager = PaymentManager(walletBackendApi, mapper) -- cgit v1.2.3