From e60563fb540c04d9ba751fea69c1fc0f1de598b5 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 22 Jul 2020 14:22:03 +0530
Subject: consistent error handling for HTTP request (and some other things)

---
 src/android/index.ts | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/android')

diff --git a/src/android/index.ts b/src/android/index.ts
index 63d88d70b..d7a5897a1 100644
--- a/src/android/index.ts
+++ b/src/android/index.ts
@@ -114,6 +114,8 @@ export class AndroidHttpLib implements HttpRequestLibrary {
     const headers = new Headers();
     if (msg.status != 0) {
       const resp: HttpResponse = {
+        // FIXME: pass through this URL
+        requestUrl: "",
         headers,
         status: msg.status,
         json: async () => JSON.parse(msg.responseText),
@@ -196,7 +198,10 @@ class AndroidWalletMessageHandler {
       }
       case "getWithdrawalDetailsForAmount": {
         const wallet = await this.wp.promise;
-        return await wallet.getWithdrawalDetailsForAmount(args.exchangeBaseUrl, args.amount);
+        return await wallet.getWithdrawalDetailsForAmount(
+          args.exchangeBaseUrl,
+          args.amount,
+        );
       }
       case "withdrawTestkudos": {
         const wallet = await this.wp.promise;
@@ -218,7 +223,10 @@ class AndroidWalletMessageHandler {
       }
       case "setExchangeTosAccepted": {
         const wallet = await this.wp.promise;
-        await wallet.acceptExchangeTermsOfService(args.exchangeBaseUrl, args.acceptedEtag);
+        await wallet.acceptExchangeTermsOfService(
+          args.exchangeBaseUrl,
+          args.acceptedEtag,
+        );
         return {};
       }
       case "retryPendingNow": {
@@ -237,7 +245,10 @@ class AndroidWalletMessageHandler {
       }
       case "acceptManualWithdrawal": {
         const wallet = await this.wp.promise;
-        const res = await wallet.acceptManualWithdrawal(args.exchangeBaseUrl, Amounts.parseOrThrow(args.amount));
+        const res = await wallet.acceptManualWithdrawal(
+          args.exchangeBaseUrl,
+          Amounts.parseOrThrow(args.amount),
+        );
         return res;
       }
       case "startTunnel": {
-- 
cgit v1.2.3