From 8817d240e2c8e6cb7b0a4ab76100964b1fd976ff Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Mon, 5 Feb 2024 08:31:49 +0700 Subject: [PATCH 1/5] fix(android/app): Cleanup AndroidManifest handling of *.kmp --- .../kMAPro/src/main/AndroidManifest.xml | 35 ++++--------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml index 7a90ccc957..41cda823b8 100644 --- a/android/KMAPro/kMAPro/src/main/AndroidManifest.xml +++ b/android/KMAPro/kMAPro/src/main/AndroidManifest.xml @@ -103,6 +103,9 @@ + - - - - - - - + - - - - - - - + @@ -177,11 +156,11 @@ From 2ed717f084e5dc115fa9e9e332fb923937fa818b Mon Sep 17 00:00:00 2001 From: "Joshua A. Horton" Date: Mon, 5 Feb 2024 13:37:47 +0700 Subject: [PATCH 2/5] fix(web): app/webview sourcemap inlining --- web/src/tools/building/sourcemap-root/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/tools/building/sourcemap-root/index.ts b/web/src/tools/building/sourcemap-root/index.ts index 20c5c0135d..c99c0c4e5c 100644 --- a/web/src/tools/building/sourcemap-root/index.ts +++ b/web/src/tools/building/sourcemap-root/index.ts @@ -99,7 +99,7 @@ if(sourceRoot) { srcMap.toFile(mapFile); if(shouldInline) { - const mapToInline = SourcemapRemapper.fromFile(mapFile).sourceRoot; + const mapToInline = SourcemapRemapper.fromFile(mapFile).sourceMap; const inlineableComment = convertSourceMap.fromObject(mapToInline).toComment(); fs.appendFileSync(scriptFile, `\n${inlineableComment}`); From eecc6cd7bd0bc1bba08fa4d20ca454e6d75288e8 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Tue, 6 Feb 2024 08:25:08 +1000 Subject: [PATCH 3/5] fix(windows): address review comments Co-authored-by: Marc Durdin --- windows/src/engine/keyman32/kmprocessactions.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/windows/src/engine/keyman32/kmprocessactions.cpp b/windows/src/engine/keyman32/kmprocessactions.cpp index b1408b98ff..ed817d754e 100644 --- a/windows/src/engine/keyman32/kmprocessactions.cpp +++ b/windows/src/engine/keyman32/kmprocessactions.cpp @@ -29,9 +29,8 @@ processBack(AITIP* app, const unsigned int code_points_to_delete, const km_core_ for (unsigned int i = 0; i < code_points_to_delete; i++) { app->QueueAction(QIT_BACK, BK_DEFAULT); } - return; } - if (!app->IsLegacy()) { + else { km_core_usv const* delete_context_ptr = delete_context; while (*delete_context_ptr) { delete_context_ptr++; @@ -45,7 +44,6 @@ processBack(AITIP* app, const unsigned int code_points_to_delete, const km_core_ app->QueueAction(QIT_BACK, BK_DEFAULT); } } - return; } } @@ -122,7 +120,7 @@ BOOL ProcessActions(BOOL* emitKeyStroke) processAlert(_td->app); } if (_td->core_actions->emit_keystroke) { - *emitKeyStroke = TRUE; + *emitKeystroke = TRUE; } processCapsLock(_td->core_actions->new_caps_lock_state, !_td->state.isDown, _td->TIPFUpdateable, FALSE); // TODO: #10583 remove dispose From 6d4b287d7dfab2fe0efe7ee8343b0a0211a36ba5 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Tue, 6 Feb 2024 08:47:22 +1000 Subject: [PATCH 4/5] feat(windows): variable name change --- windows/src/engine/keyman32/kmprocessactions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/src/engine/keyman32/kmprocessactions.cpp b/windows/src/engine/keyman32/kmprocessactions.cpp index ed817d754e..7e089fb286 100644 --- a/windows/src/engine/keyman32/kmprocessactions.cpp +++ b/windows/src/engine/keyman32/kmprocessactions.cpp @@ -97,7 +97,7 @@ static void processCapsLock(const km_core_caps_state caps_lock_state, BOOL isUp, } } -BOOL ProcessActions(BOOL* emitKeyStroke) +BOOL ProcessActions(BOOL* emitKeystroke) { PKEYMAN64THREADDATA _td = ThreadGlobals(); if (!_td) return FALSE; @@ -131,7 +131,7 @@ BOOL ProcessActions(BOOL* emitKeyStroke) } BOOL -ProcessActionsNonUpdatableParse(BOOL* emitKeyStroke) { +ProcessActionsNonUpdatableParse(BOOL* emitKeystroke) { PKEYMAN64THREADDATA _td = ThreadGlobals(); if (!_td) { return FALSE; @@ -151,7 +151,7 @@ ProcessActionsNonUpdatableParse(BOOL* emitKeyStroke) { SendDebugMessageFormat(0, sdmGlobal, 0, "ProcessActionsNonUpdatableParse: km_core_state_get_actions"); processCapsLock(_td->core_actions->new_caps_lock_state, !_td->state.isDown, _td->TIPFUpdateable, FALSE); if (_td->core_actions->emit_keystroke) { - *emitKeyStroke = TRUE; + *emitKeystroke = TRUE; SendDebugMessageFormat(0, sdmGlobal, 0, "ProcessActionsNonUpdatableParse EMIT_KEYSTROKE"); _td->CoreProcessEventRun = FALSE; // If we emit the key stroke on this parse we don't need the second parse } From 84cdfe50b023ec46cdff52f8d1d3243143687447 Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Tue, 6 Feb 2024 13:02:18 -0500 Subject: [PATCH 5/5] auto: increment master version to 17.0.262 --- HISTORY.md | 5 +++++ VERSION.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index 16e55b2df7..1af7ae3742 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Keyman Version History +## 17.0.261 alpha 2024-02-06 + +* fix(web): app/webview sourcemap inlining (#10631) +* fix(android/app): Cleanup AndroidManifest handling of *.kmp (#10624) + ## 17.0.260 alpha 2024-02-03 * chore(oem/fv): Update versions in keyboards.csv (#10606) diff --git a/VERSION.md b/VERSION.md index 69afe3706f..4c4d02756b 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -17.0.261 \ No newline at end of file +17.0.262 \ No newline at end of file