[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-terminal-android] 03/19: Fix crash when loading history
From: |
gnunet |
Subject: |
[taler-merchant-terminal-android] 03/19: Fix crash when loading history |
Date: |
Fri, 21 Feb 2020 18:59:56 +0100 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository merchant-terminal-android.
commit dc02246e8b5764b793bbd2430a6057c32faa9b33
Author: Torsten Grote <address@hidden>
AuthorDate: Thu Jan 30 15:09:19 2020 -0300
Fix crash when loading history
---
app/src/main/java/net/taler/merchantpos/MerchantHistory.kt | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/net/taler/merchantpos/MerchantHistory.kt
b/app/src/main/java/net/taler/merchantpos/MerchantHistory.kt
index 577615b..c389c5f 100644
--- a/app/src/main/java/net/taler/merchantpos/MerchantHistory.kt
+++ b/app/src/main/java/net/taler/merchantpos/MerchantHistory.kt
@@ -106,15 +106,16 @@ class MerchantHistory : Fragment() {
private fun onHistoryResponse(body: JSONObject) {
this.isLoading.value = false
- Log.v(TAG, "got history response ${body}")
+ Log.v(TAG, "got history response $body")
+ // TODO use jackson instead of manual parsing
val data = arrayListOf<HistoryItem>()
val historyJson = body.getJSONArray("history")
for (i in 0 until historyJson.length()) {
val item = historyJson.getJSONObject(i)
val orderId = item.getString("order_id")
val summary = item.getString("summary")
- val timestampStr = item.getString("timestamp")
- val timestamp = parseTalerTimestamp(timestampStr)
+ val timestampObj = item.getJSONObject("timestamp")
+ val timestamp = Instant.ofEpochSecond(timestampObj.getLong("t_ms"))
val amount = Amount.fromString(item.getString("amount"))
data.add(HistoryItem(orderId, amount, summary, timestamp))
}
@@ -161,7 +162,7 @@ class MerchantHistory : Fragment() {
fetchHistory()
}
- this.isLoading.observe(this, androidx.lifecycle.Observer { loading ->
+ this.isLoading.observe(viewLifecycleOwner, androidx.lifecycle.Observer
{ loading ->
Log.v(TAG, "setting refreshing to $loading")
refreshLayout.isRefreshing = loading
})
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-merchant-terminal-android] branch master updated (f463d1b -> 39af919), gnunet, 2020/02/21
- [taler-merchant-terminal-android] 03/19: Fix crash when loading history,
gnunet <=
- [taler-merchant-terminal-android] 01/19: Upgrade libraries to latest stable versions, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 05/19: Allow user to undo restarting the order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 07/19: Add ordered products to order's contract terms, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 08/19: Use actual taler icon for the app, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 09/19: Factor out NFC code from MainActivity, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 06/19: Create payments directly from the order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 04/19: Fetch merchant config from central configuration JSON, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 02/19: Add screen to process an order, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 18/19: Don't talk about NFC if it is not supported, gnunet, 2020/02/21
- [taler-merchant-terminal-android] 14/19: Use product categories for order summary, gnunet, 2020/02/21