[taler-wallet-core] branch master updated: versions for android

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new b504a521 versions for android
b504a521 is described below

commit b504a5218ad99c04de8077f222747334f53d6ac0
Author: Florian Dold <address@hidden>
AuthorDate: Tue May 12 15:51:40 2020 +0530

    versions for android
---
 src/android/index.ts       |  8 +++++++-
 src/operations/versions.ts | 10 ++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/android/index.ts b/src/android/index.ts
index 019fe1fb..36a3d47a 100644
--- a/src/android/index.ts
+++ b/src/android/index.ts
@@ -33,6 +33,7 @@ import {
 } from "../util/http";
 import { NodeHttpLib } from "../headless/NodeHttpLib";
 import { WalletNotification } from "../types/notifications";
+import { WALLET_EXCHANGE_PROTOCOL_VERSION, WALLET_MERCHANT_PROTOCOL_VERSION } 
from "../operations/versions";
 
 // @ts-ignore: special built-in module
 //import akono = require("akono");
@@ -154,7 +155,12 @@ class AndroidWalletMessageHandler {
           console.error("Error during wallet retry loop", e);
         });
         this.wp.resolve(w);
-        return {};
+        return {
+          supported_protocol_versions: {
+            exchange: WALLET_EXCHANGE_PROTOCOL_VERSION,
+            merchant: WALLET_MERCHANT_PROTOCOL_VERSION,
+          }
+        };
       }
       case "abortProposal": {
         const wallet = await this.wp.promise;
diff --git a/src/operations/versions.ts b/src/operations/versions.ts
index 8b55bd4d..cfe6ed49 100644
--- a/src/operations/versions.ts
+++ b/src/operations/versions.ts
@@ -15,13 +15,19 @@
  */
 
 /**
- * Wallet protocol version spoken with the exchange
- * and merchant.
+ * Protocol version spoken with the exchange.
  *
  * Uses libtool's current:revision:age versioning.
  */
 export const WALLET_EXCHANGE_PROTOCOL_VERSION = "7:0:0";
 
+/**
+ * Protocol version spoken with the merchant.
+ *
+ * Uses libtool's current:revision:age versioning.
+ */
+export const WALLET_MERCHANT_PROTOCOL_VERSION = "0:0:0";
+
 /**
  * Cache breaker that is appended to queries such as /keys and /wire
  * to break through caching, if it has been accidentally/badly configured

-- 
To stop receiving notification emails like this one, please contact
address@hidden.