ReviewOS
Reload

also looking at this

craft-native/craft

fix(android): an apostrophe in a reply hangs the page forever

#156
Merged glennmichael123 wants to merge fix/android-js-escaping into main
4 files +279 -73
packages/android/templates/CraftBridge.kt.templatemodified+69-55
@@ -166,6 +166,20 @@ class CraftBridge(
166166 )
167167 }
168168
169 /**
170 * Quote a value for interpolation into JavaScript.
171 *
172 * The result carries its own quotes, so write `f($payload)` — leaving the
173 * surrounding `'...'` in place would quote it twice. A Kotlin null renders as
174 * the string "null", which is what plain interpolation produced before; whether
175 * that should instead be a JS null is a separate question from escaping.
176 *
177 * Without this, a value containing an apostrophe ends the JS string early, the
178 * script fails to parse, and `evaluateJavascript` runs nothing at all — so a
179 * hand-built promise with no timeout never settles.
180 */
181 private fun jsQuote(value: String?): String = JSONObject.quote(value ?: "null")
182
169183 fun injectBridge() {
170184 // Before the script, so a native callback arriving while the page is
171185 // still loading has somewhere to go rather than being counted as
@@ -1474,7 +1488,7 @@ class CraftBridge(
14741488
14751489 val event = if (requestCode == REQUEST_CAMERA) "_craftCameraResolve" else "_craftGalleryResolve"
14761490 activity.runOnUiThread {
1477 webView.evaluateJavascript("window.$event && window.$event('$imageUri')", null)
1491 webView.evaluateJavascript("window.$event && window.$event(${jsQuote(imageUri)})", null)
14781492 }
14791493 }
14801494
@@ -1525,7 +1539,7 @@ class CraftBridge(
15251539
15261540 override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
15271541 webView.evaluateJavascript(
1528 "window._craftBiometricReject && window._craftBiometricReject('$errString')",
1542 "window._craftBiometricReject && window._craftBiometricReject(${jsQuote(errString)})",
15291543 null
15301544 )
15311545 }
@@ -1655,7 +1669,7 @@ class CraftBridge(
16551669 }?.addOnFailureListener { e ->
16561670 activity.runOnUiThread {
16571671 webView.evaluateJavascript(
1658 "window._craftLocationReject && window._craftLocationReject({code: 2, message: '${e.message}'})",
1672 "window._craftLocationReject && window._craftLocationReject({code: 2, message: ${jsQuote(e.message)}})",
16591673 null
16601674 )
16611675 }
@@ -2110,7 +2124,7 @@ class CraftBridge(
21102124 currentAppState = newState
21112125 activity.runOnUiThread {
21122126 webView.evaluateJavascript(
2113 "window._craftAppStateCallback && window._craftAppStateCallback('$currentAppState')",
2127 "window._craftAppStateCallback && window._craftAppStateCallback(${jsQuote(currentAppState)})",
21142128 null
21152129 )
21162130 }
@@ -2247,11 +2261,11 @@ class CraftBridge(
22472261 val contactId = ContentUris.parseId(results[0].uri!!)
22482262
22492263 activity.runOnUiThread {
2250 webView.evaluateJavascript("window._craftAddContactResolve && window._craftAddContactResolve('$contactId')", null)
2264 webView.evaluateJavascript("window._craftAddContactResolve && window._craftAddContactResolve(${jsQuote(contactId)})", null)
22512265 }
22522266 } catch (e: Exception) {
22532267 activity.runOnUiThread {
2254 webView.evaluateJavascript("window._craftAddContactReject && window._craftAddContactReject('${e.message}')", null)
2268 webView.evaluateJavascript("window._craftAddContactReject && window._craftAddContactReject(${jsQuote(e.message)})", null)
22552269 }
22562270 }
22572271 }
@@ -2339,11 +2353,11 @@ class CraftBridge(
23392353 val eventId = uri?.lastPathSegment ?: ""
23402354
23412355 activity.runOnUiThread {
2342 webView.evaluateJavascript("window._craftCreateEventResolve && window._craftCreateEventResolve('$eventId')", null)
2356 webView.evaluateJavascript("window._craftCreateEventResolve && window._craftCreateEventResolve(${jsQuote(eventId)})", null)
23432357 }
23442358 } catch (e: Exception) {
23452359 activity.runOnUiThread {
2346 webView.evaluateJavascript("window._craftCreateEventReject && window._craftCreateEventReject('${e.message}')", null)
2360 webView.evaluateJavascript("window._craftCreateEventReject && window._craftCreateEventReject(${jsQuote(e.message)})", null)
23472361 }
23482362 }
23492363 }
@@ -2362,7 +2376,7 @@ class CraftBridge(
23622376 }
23632377 } catch (e: Exception) {
23642378 activity.runOnUiThread {
2365 webView.evaluateJavascript("window._craftDeleteEventReject && window._craftDeleteEventReject('${e.message}')", null)
2379 webView.evaluateJavascript("window._craftDeleteEventReject && window._craftDeleteEventReject(${jsQuote(e.message)})", null)
23662380 }
23672381 }
23682382 }
@@ -2399,11 +2413,11 @@ class CraftBridge(
23992413 }
24002414
24012415 activity.runOnUiThread {
2402 webView.evaluateJavascript("window._craftNotifResolve && window._craftNotifResolve('$id')", null)
2416 webView.evaluateJavascript("window._craftNotifResolve && window._craftNotifResolve(${jsQuote(id)})", null)
24032417 }
24042418 } catch (e: Exception) {
24052419 activity.runOnUiThread {
2406 webView.evaluateJavascript("window._craftNotifReject && window._craftNotifReject('${e.message}')", null)
2420 webView.evaluateJavascript("window._craftNotifReject && window._craftNotifReject(${jsQuote(e.message)})", null)
24072421 }
24082422 }
24092423 }
@@ -2496,7 +2510,7 @@ class CraftBridge(
24962510 })
24972511 } catch (e: Exception) {
24982512 activity.runOnUiThread {
2499 webView.evaluateJavascript("window._craftProductsReject && window._craftProductsReject('${e.message}')", null)
2513 webView.evaluateJavascript("window._craftProductsReject && window._craftProductsReject(${jsQuote(e.message)})", null)
25002514 }
25012515 }
25022516 }
@@ -2625,14 +2639,14 @@ class CraftBridge(
26252639
26262640 activity.runOnUiThread {
26272641 webView.evaluateJavascript(
2628 "window._craftDownloadResolve && window._craftDownloadResolve('$downloadId')",
2642 "window._craftDownloadResolve && window._craftDownloadResolve(${jsQuote(downloadId)})",
26292643 null
26302644 )
26312645 }
26322646 } catch (e: Exception) {
26332647 activity.runOnUiThread {
26342648 webView.evaluateJavascript(
2635 "window._craftDownloadReject && window._craftDownloadReject('${e.message}')",
2649 "window._craftDownloadReject && window._craftDownloadReject(${jsQuote(e.message)})",
26362650 null
26372651 )
26382652 }
@@ -2658,14 +2672,14 @@ class CraftBridge(
26582672
26592673 activity.runOnUiThread {
26602674 webView.evaluateJavascript(
2661 "window._craftSaveResolve && window._craftSaveResolve('${file.absolutePath}')",
2675 "window._craftSaveResolve && window._craftSaveResolve(${jsQuote(file.absolutePath)})",
26622676 null
26632677 )
26642678 }
26652679 } catch (e: Exception) {
26662680 activity.runOnUiThread {
26672681 webView.evaluateJavascript(
2668 "window._craftSaveReject && window._craftSaveReject('${e.message}')",
2682 "window._craftSaveReject && window._craftSaveReject(${jsQuote(e.message)})",
26692683 null
26702684 )
26712685 }
@@ -2723,7 +2737,7 @@ class CraftBridge(
27232737 }
27242738 } catch (e: Exception) {
27252739 activity.runOnUiThread {
2726 webView.evaluateJavascript("window._craftAudioReject && window._craftAudioReject('${e.message}')", null)
2740 webView.evaluateJavascript("window._craftAudioReject && window._craftAudioReject(${jsQuote(e.message)})", null)
27272741 }
27282742 }
27292743 }
@@ -2739,7 +2753,7 @@ class CraftBridge(
27392753 val bytes = file.readBytes()
27402754 val base64 = "data:audio/m4a;base64," + Base64.encodeToString(bytes, Base64.NO_WRAP)
27412755 activity.runOnUiThread {
2742 webView.evaluateJavascript("window._craftAudioStopResolve && window._craftAudioStopResolve('$base64')", null)
2756 webView.evaluateJavascript("window._craftAudioStopResolve && window._craftAudioStopResolve(${jsQuote(base64)})", null)
27432757 }
27442758 } ?: run {
27452759 activity.runOnUiThread {
@@ -2748,7 +2762,7 @@ class CraftBridge(
27482762 }
27492763 } catch (e: Exception) {
27502764 activity.runOnUiThread {
2751 webView.evaluateJavascript("window._craftAudioStopReject && window._craftAudioStopReject('${e.message}')", null)
2765 webView.evaluateJavascript("window._craftAudioStopReject && window._craftAudioStopReject(${jsQuote(e.message)})", null)
27522766 }
27532767 }
27542768 }
@@ -2835,7 +2849,7 @@ class CraftBridge(
28352849 } catch (e: Exception) {
28362850 activity.runOnUiThread {
28372851 webView.evaluateJavascript(
2838 "window._craftDbExecReject && window._craftDbExecReject('${e.message}')",
2852 "window._craftDbExecReject && window._craftDbExecReject(${jsQuote(e.message)})",
28392853 null
28402854 )
28412855 }
@@ -2875,7 +2889,7 @@ class CraftBridge(
28752889 } catch (e: Exception) {
28762890 activity.runOnUiThread {
28772891 webView.evaluateJavascript(
2878 "window._craftDbQueryReject && window._craftDbQueryReject('${e.message}')",
2892 "window._craftDbQueryReject && window._craftDbQueryReject(${jsQuote(e.message)})",
28792893 null
28802894 )
28812895 }
@@ -2980,9 +2994,9 @@ class CraftBridge(
29802994 bitmap.compress(Bitmap.CompressFormat.PNG, 100, outputStream)
29812995 val base64 = "data:image/png;base64," + Base64.encodeToString(outputStream.toByteArray(), Base64.NO_WRAP)
29822996
2983 webView.evaluateJavascript("window._craftScreenshotResolve && window._craftScreenshotResolve('$base64')", null)
2997 webView.evaluateJavascript("window._craftScreenshotResolve && window._craftScreenshotResolve(${jsQuote(base64)})", null)
29842998 } catch (e: Exception) {
2985 webView.evaluateJavascript("window._craftScreenshotReject && window._craftScreenshotReject('${e.message}')", null)
2999 webView.evaluateJavascript("window._craftScreenshotReject && window._craftScreenshotReject(${jsQuote(e.message)})", null)
29863000 }
29873001 }
29883002 }
@@ -2995,14 +3009,14 @@ class CraftBridge(
29953009 // WorkManager tasks don't require explicit registration, just track them
29963010 activity.runOnUiThread {
29973011 webView.evaluateJavascript(
2998 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: '$taskId', registered: true})",
3012 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: ${jsQuote(taskId)}, registered: true})",
29993013 null
30003014 )
30013015 }
30023016 } catch (e: Exception) {
30033017 activity.runOnUiThread {
30043018 webView.evaluateJavascript(
3005 "window._craftBgTaskReject && window._craftBgTaskReject('${e.message}')",
3019 "window._craftBgTaskReject && window._craftBgTaskReject(${jsQuote(e.message)})",
30063020 null
30073021 )
30083022 }
@@ -3017,14 +3031,14 @@ class CraftBridge(
30173031 // This is a placeholder that shows the API structure
30183032 activity.runOnUiThread {
30193033 webView.evaluateJavascript(
3020 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: '$taskId', scheduled: true, delay: $delay})",
3034 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: ${jsQuote(taskId)}, scheduled: true, delay: $delay})",
30213035 null
30223036 )
30233037 }
30243038 } catch (e: Exception) {
30253039 activity.runOnUiThread {
30263040 webView.evaluateJavascript(
3027 "window._craftBgTaskReject && window._craftBgTaskReject('${e.message}')",
3041 "window._craftBgTaskReject && window._craftBgTaskReject(${jsQuote(e.message)})",
30283042 null
30293043 )
30303044 }
@@ -3036,14 +3050,14 @@ class CraftBridge(
30363050 try {
30373051 activity.runOnUiThread {
30383052 webView.evaluateJavascript(
3039 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: '$taskId', cancelled: true})",
3053 "window._craftBgTaskResolve && window._craftBgTaskResolve({taskId: ${jsQuote(taskId)}, cancelled: true})",
30403054 null
30413055 )
30423056 }
30433057 } catch (e: Exception) {
30443058 activity.runOnUiThread {
30453059 webView.evaluateJavascript(
3046 "window._craftBgTaskReject && window._craftBgTaskReject('${e.message}')",
3060 "window._craftBgTaskReject && window._craftBgTaskReject(${jsQuote(e.message)})",
30473061 null
30483062 )
30493063 }
@@ -3062,7 +3076,7 @@ class CraftBridge(
30623076 } catch (e: Exception) {
30633077 activity.runOnUiThread {
30643078 webView.evaluateJavascript(
3065 "window._craftBgTaskReject && window._craftBgTaskReject('${e.message}')",
3079 "window._craftBgTaskReject && window._craftBgTaskReject(${jsQuote(e.message)})",
30663080 null
30673081 )
30683082 }
@@ -3099,7 +3113,7 @@ class CraftBridge(
30993113 )
31003114 } catch (e: Exception) {
31013115 webView.evaluateJavascript(
3102 "window._craftPDFReject && window._craftPDFReject('${e.message}')",
3116 "window._craftPDFReject && window._craftPDFReject(${jsQuote(e.message)})",
31033117 null
31043118 )
31053119 }
@@ -3204,7 +3218,7 @@ class CraftBridge(
32043218 } catch (e: Exception) {
32053219 activity.runOnUiThread {
32063220 webView.evaluateJavascript(
3207 "window._craftPickContactReject && window._craftPickContactReject('${e.message}')",
3221 "window._craftPickContactReject && window._craftPickContactReject(${jsQuote(e.message)})",
32083222 null
32093223 )
32103224 }
@@ -3261,7 +3275,7 @@ class CraftBridge(
32613275 } catch (e: Exception) {
32623276 activity.runOnUiThread {
32633277 webView.evaluateJavascript(
3264 "window._craftShortcutsReject && window._craftShortcutsReject('${e.message}')",
3278 "window._craftShortcutsReject && window._craftShortcutsReject(${jsQuote(e.message)})",
32653279 null
32663280 )
32673281 }
@@ -3284,7 +3298,7 @@ class CraftBridge(
32843298 } catch (e: Exception) {
32853299 activity.runOnUiThread {
32863300 webView.evaluateJavascript(
3287 "window._craftShortcutsReject && window._craftShortcutsReject('${e.message}')",
3301 "window._craftShortcutsReject && window._craftShortcutsReject(${jsQuote(e.message)})",
32883302 null
32893303 )
32903304 }
@@ -3310,14 +3324,14 @@ class CraftBridge(
33103324
33113325 activity.runOnUiThread {
33123326 webView.evaluateJavascript(
3313 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({success: true, key: '$key'})",
3327 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({success: true, key: ${jsQuote(key)}})",
33143328 null
33153329 )
33163330 }
33173331 } catch (e: Exception) {
33183332 activity.runOnUiThread {
33193333 webView.evaluateJavascript(
3320 "window._craftSharedKeychainReject && window._craftSharedKeychainReject('${e.message}')",
3334 "window._craftSharedKeychainReject && window._craftSharedKeychainReject(${jsQuote(e.message)})",
33213335 null
33223336 )
33233337 }
@@ -3334,12 +3348,12 @@ class CraftBridge(
33343348 activity.runOnUiThread {
33353349 if (value != null) {
33363350 webView.evaluateJavascript(
3337 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({value: '$value', key: '$key'})",
3351 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({value: ${jsQuote(value)}, key: ${jsQuote(key)}})",
33383352 null
33393353 )
33403354 } else {
33413355 webView.evaluateJavascript(
3342 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({value: null, key: '$key'})",
3356 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({value: null, key: ${jsQuote(key)}})",
33433357 null
33443358 )
33453359 }
@@ -3347,7 +3361,7 @@ class CraftBridge(
33473361 } catch (e: Exception) {
33483362 activity.runOnUiThread {
33493363 webView.evaluateJavascript(
3350 "window._craftSharedKeychainReject && window._craftSharedKeychainReject('${e.message}')",
3364 "window._craftSharedKeychainReject && window._craftSharedKeychainReject(${jsQuote(e.message)})",
33513365 null
33523366 )
33533367 }
@@ -3363,14 +3377,14 @@ class CraftBridge(
33633377
33643378 activity.runOnUiThread {
33653379 webView.evaluateJavascript(
3366 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({success: true, key: '$key'})",
3380 "window._craftSharedKeychainResolve && window._craftSharedKeychainResolve({success: true, key: ${jsQuote(key)}})",
33673381 null
33683382 )
33693383 }
33703384 } catch (e: Exception) {
33713385 activity.runOnUiThread {
33723386 webView.evaluateJavascript(
3373 "window._craftSharedKeychainReject && window._craftSharedKeychainReject('${e.message}')",
3387 "window._craftSharedKeychainReject && window._craftSharedKeychainReject(${jsQuote(e.message)})",
33743388 null
33753389 )
33763390 }
@@ -3404,7 +3418,7 @@ class CraftBridge(
34043418 } catch (e: Exception) {
34053419 activity.runOnUiThread {
34063420 webView.evaluateJavascript(
3407 "window._craftAuthPersistReject && window._craftAuthPersistReject('${e.message}')",
3421 "window._craftAuthPersistReject && window._craftAuthPersistReject(${jsQuote(e.message)})",
34083422 null
34093423 )
34103424 }
@@ -3428,7 +3442,7 @@ class CraftBridge(
34283442 } catch (e: Exception) {
34293443 activity.runOnUiThread {
34303444 webView.evaluateJavascript(
3431 "window._craftAuthPersistReject && window._craftAuthPersistReject('${e.message}')",
3445 "window._craftAuthPersistReject && window._craftAuthPersistReject(${jsQuote(e.message)})",
34323446 null
34333447 )
34343448 }
@@ -3448,7 +3462,7 @@ class CraftBridge(
34483462 } catch (e: Exception) {
34493463 activity.runOnUiThread {
34503464 webView.evaluateJavascript(
3451 "window._craftAuthPersistReject && window._craftAuthPersistReject('${e.message}')",
3465 "window._craftAuthPersistReject && window._craftAuthPersistReject(${jsQuote(e.message)})",
34523466 null
34533467 )
34543468 }
@@ -3540,7 +3554,7 @@ class CraftBridge(
35403554 .addOnFailureListener { e ->
35413555 activity.runOnUiThread {
35423556 webView.evaluateJavascript(
3543 "window._craftMLReject && window._craftMLReject('${e.message}')",
3557 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
35443558 null
35453559 )
35463560 }
@@ -3548,7 +3562,7 @@ class CraftBridge(
35483562 } catch (e: Exception) {
35493563 activity.runOnUiThread {
35503564 webView.evaluateJavascript(
3551 "window._craftMLReject && window._craftMLReject('${e.message}')",
3565 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
35523566 null
35533567 )
35543568 }
@@ -3607,7 +3621,7 @@ class CraftBridge(
36073621 .addOnFailureListener { e ->
36083622 activity.runOnUiThread {
36093623 webView.evaluateJavascript(
3610 "window._craftMLReject && window._craftMLReject('${e.message}')",
3624 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
36113625 null
36123626 )
36133627 }
@@ -3615,7 +3629,7 @@ class CraftBridge(
36153629 } catch (e: Exception) {
36163630 activity.runOnUiThread {
36173631 webView.evaluateJavascript(
3618 "window._craftMLReject && window._craftMLReject('${e.message}')",
3632 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
36193633 null
36203634 )
36213635 }
@@ -3662,7 +3676,7 @@ class CraftBridge(
36623676 .addOnFailureListener { e ->
36633677 activity.runOnUiThread {
36643678 webView.evaluateJavascript(
3665 "window._craftMLReject && window._craftMLReject('${e.message}')",
3679 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
36663680 null
36673681 )
36683682 }
@@ -3670,7 +3684,7 @@ class CraftBridge(
36703684 } catch (e: Exception) {
36713685 activity.runOnUiThread {
36723686 webView.evaluateJavascript(
3673 "window._craftMLReject && window._craftMLReject('${e.message}')",
3687 "window._craftMLReject && window._craftMLReject(${jsQuote(e.message)})",
36743688 null
36753689 )
36763690 }
@@ -3718,7 +3732,7 @@ class CraftBridge(
37183732 } catch (e: Exception) {
37193733 activity.runOnUiThread {
37203734 webView.evaluateJavascript(
3721 "window._craftWidgetReject && window._craftWidgetReject('${e.message}')",
3735 "window._craftWidgetReject && window._craftWidgetReject(${jsQuote(e.message)})",
37223736 null
37233737 )
37243738 }
@@ -3750,7 +3764,7 @@ class CraftBridge(
37503764
37513765 activity.runOnUiThread {
37523766 webView.evaluateJavascript(
3753 "window._craftVoiceResolve && window._craftVoiceResolve({registered: true, action: '$action', phrase: '$phrase'})",
3767 "window._craftVoiceResolve && window._craftVoiceResolve({registered: true, action: ${jsQuote(action)}, phrase: ${jsQuote(phrase)}})",
37543768 null
37553769 )
37563770 }
@@ -3763,7 +3777,7 @@ class CraftBridge(
37633777
37643778 activity.runOnUiThread {
37653779 webView.evaluateJavascript(
3766 "window._craftVoiceResolve && window._craftVoiceResolve({removed: true, action: '$action'})",
3780 "window._craftVoiceResolve && window._craftVoiceResolve({removed: true, action: ${jsQuote(action)}})",
37673781 null
37683782 )
37693783 }
@@ -3778,7 +3792,7 @@ class CraftBridge(
37783792 if (action != null) {
37793793 activity.runOnUiThread {
37803794 webView.evaluateJavascript(
3781 "window.dispatchEvent(new CustomEvent('craftVoiceAction', {detail: {action: '$action', data: '$data'}}));",
3795 "window.dispatchEvent(new CustomEvent('craftVoiceAction', {detail: {action: ${jsQuote(action)}, data: ${jsQuote(data)}}}));",
37823796 null
37833797 )
37843798 }
@@ -3927,7 +3941,7 @@ class CraftBridge(
39273941 val json = JSONObject(data).toString()
39283942 activity.runOnUiThread {
39293943 webView.evaluateJavascript(
3930 "window.dispatchEvent(new CustomEvent('$event', {detail: $json}));",
3944 "window.dispatchEvent(new CustomEvent(${jsQuote(event)}, {detail: $json}));",
39313945 null
39323946 )
39333947 }