diff options
author | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2021-07-07 02:42:55 -0400 |
---|---|---|
committer | Jonathan Buchanan <jonathan.russ.buchanan@gmail.com> | 2021-07-07 02:42:55 -0400 |
commit | ff09c98f3b0515dd92dc5f9bab887336b080b4f5 (patch) | |
tree | 8f9855a914ec62a239bf65b68c756ac7d9ae9539 /packages | |
parent | 678a90934c7b819b1d5c864f7429242d7d74a1e6 (diff) |
change taler-wallet-android to taler-wallet-embedded
Diffstat (limited to 'packages')
-rw-r--r-- | packages/taler-wallet-embedded/package.json (renamed from packages/taler-wallet-android/package.json) | 4 | ||||
-rw-r--r-- | packages/taler-wallet-embedded/rollup.config.js (renamed from packages/taler-wallet-android/rollup.config.js) | 0 | ||||
-rw-r--r-- | packages/taler-wallet-embedded/src/index.ts (renamed from packages/taler-wallet-android/src/index.ts) | 34 | ||||
-rw-r--r-- | packages/taler-wallet-embedded/tsconfig.json (renamed from packages/taler-wallet-android/tsconfig.json) | 0 |
4 files changed, 19 insertions, 19 deletions
diff --git a/packages/taler-wallet-android/package.json b/packages/taler-wallet-embedded/package.json index 8a0c4048c..9a5a1c9e6 100644 --- a/packages/taler-wallet-android/package.json +++ b/packages/taler-wallet-embedded/package.json @@ -1,5 +1,5 @@ { - "name": "@gnu-taler/taler-wallet-android", + "name": "@gnu-taler/taler-wallet-embedded", "version": "0.8.0", "description": "", "engines": { @@ -9,7 +9,7 @@ "type": "git", "url": "git://git.taler.net/wallet-core.git" }, - "main": "dist/taler-wallet-android.js", + "main": "dist/taler-wallet-embedded.js", "author": "Florian Dold", "license": "GPL-3.0", "scripts": { diff --git a/packages/taler-wallet-android/rollup.config.js b/packages/taler-wallet-embedded/rollup.config.js index 7cdca3b98..7cdca3b98 100644 --- a/packages/taler-wallet-android/rollup.config.js +++ b/packages/taler-wallet-embedded/rollup.config.js diff --git a/packages/taler-wallet-android/src/index.ts b/packages/taler-wallet-embedded/src/index.ts index 7f2d44c5d..0dcfaad6b 100644 --- a/packages/taler-wallet-android/src/index.ts +++ b/packages/taler-wallet-embedded/src/index.ts @@ -46,7 +46,7 @@ import { export { handleWorkerError, handleWorkerMessage }; -export class AndroidHttpLib implements HttpRequestLibrary { +export class NativeHttpLib implements HttpRequestLibrary { useNfcTunnel = false; private nodeHttpLib: HttpRequestLibrary = new NodeHttpLib(); @@ -138,12 +138,12 @@ export class AndroidHttpLib implements HttpRequestLibrary { } } -function sendAkonoMessage(ev: CoreApiEnvelope): void { +function sendNativeMessage(ev: CoreApiEnvelope): void { // @ts-ignore - const sendMessage = globalThis.__akono_sendMessage; + const sendMessage = globalThis.__native_sendMessage; if (typeof sendMessage !== "function") { const errMsg = - "FATAL: cannot install android wallet listener: akono functions missing"; + "FATAL: cannot install native wallet listener: native functions missing"; console.error(errMsg); throw new Error(errMsg); } @@ -152,14 +152,14 @@ function sendAkonoMessage(ev: CoreApiEnvelope): void { sendMessage(m); } -class AndroidWalletMessageHandler { +class NativeWalletMessageHandler { walletArgs: DefaultNodeWalletArgs | undefined; maybeWallet: Wallet | undefined; wp = openPromise<Wallet>(); httpLib = new NodeHttpLib(); /** - * Handle a request from the Android wallet. + * Handle a request from the native wallet. */ async handleMessage( operation: string, @@ -178,7 +178,7 @@ class AndroidWalletMessageHandler { const reinit = async () => { const w = await getDefaultNodeWallet(this.walletArgs); this.maybeWallet = w; - await w.handleCoreApiRequest("initWallet", "akono-init", {}); + await w.handleCoreApiRequest("initWallet", "native-init", {}); w.runRetryLoop().catch((e) => { console.error("Error during wallet retry loop", e); }); @@ -189,7 +189,7 @@ class AndroidWalletMessageHandler { case "init": { this.walletArgs = { notifyHandler: async (notification: WalletNotification) => { - sendAkonoMessage({ type: "notification", payload: notification }); + sendNativeMessage({ type: "notification", payload: notification }); }, persistentStoragePath: args.persistentStoragePath, httpLib: this.httpLib, @@ -241,8 +241,8 @@ class AndroidWalletMessageHandler { } } -export function installAndroidWalletListener(): void { - const handler = new AndroidWalletMessageHandler(); +export function installNativeWalletListener(): void { + const handler = new NativeWalletMessageHandler(); const onMessage = async (msgStr: any): Promise<void> => { if (typeof msgStr !== "string") { console.error("expected string as message"); @@ -252,19 +252,19 @@ export function installAndroidWalletListener(): void { const operation = msg.operation; if (typeof operation !== "string") { console.error( - "message to android wallet helper must contain operation of type string", + "message to native wallet helper must contain operation of type string", ); return; } const id = msg.id; - console.log(`android listener: got request for ${operation} (${id})`); + console.log(`native listener: got request for ${operation} (${id})`); try { const respMsg = await handler.handleMessage(operation, id, msg.args); console.log( - `android listener: sending success response for ${operation} (${id})`, + `native listener: sending success response for ${operation} (${id})`, ); - sendAkonoMessage(respMsg); + sendNativeMessage(respMsg); } catch (e) { const respMsg: CoreApiResponse = { type: "error", @@ -276,13 +276,13 @@ export function installAndroidWalletListener(): void { {}, ), }; - sendAkonoMessage(respMsg); + sendNativeMessage(respMsg); return; } }; // @ts-ignore - globalThis.__akono_onMessage = onMessage; + globalThis.__native_onMessage = onMessage; - console.log("android wallet listener installed"); + console.log("native wallet listener installed"); } diff --git a/packages/taler-wallet-android/tsconfig.json b/packages/taler-wallet-embedded/tsconfig.json index 62be133ef..62be133ef 100644 --- a/packages/taler-wallet-android/tsconfig.json +++ b/packages/taler-wallet-embedded/tsconfig.json |