Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-08-10 01:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2103 from RoboSats/refactor-android-app-messages

Browse Source 
Refactor android app messages
This commit is contained in:
KoalaSat
2025-07-24 14:24:05 +00:00
committed by GitHub
parent 7df09bee93 34aefb99e5
commit eb50bc32f7
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
android/app/src/main/java/com/robosats/WebAppInterface.kt
View File

@ -319,14 +319,8 @@ class WebAppInterface(private val context: Context, private val webView: WebView
} }
private fun onWsMessage(path: String?, message: String?) { private fun onWsMessage(path: String?, message: String?) {
val escapedMessage = message val encodedMessage = encodeForJavaScript(message)
?.replace("\\", "\\\\") safeEvaluateJavascript("javascript:window.AndroidRobosats.onWSMessage('$path', '$encodedMessage')")
?.replace("'", "\\'")
?.replace("\"", "\\\"")
?.replace("\n", "\\n")
?.replace("\r", "\\r")
?.replace("\t", "\\t")
safeEvaluateJavascript("javascript:window.AndroidRobosats.onWSMessage('$path', '$escapedMessage')")
} }
private fun onWsError(path: String?) { private fun onWsError(path: String?) {
@ -386,12 +380,15 @@ class WebAppInterface(private val context: Context, private val webView: WebView
} }
} }
private fun encodeForJavaScript(input: String): String { private fun encodeForJavaScript(input: String?): String {
if (input == null) return ""
return input.replace("\\", "\\\\") return input.replace("\\", "\\\\")
.replace("'", "\\'") .replace("'", "\\'")
.replace("\"", "\\\"") .replace("\"", "\\\"")
.replace("\n", "\\n") .replace("\n", "\\n")
.replace("\r", "\\r") .replace("\r", "\\r")
.replace("\t", "\\t")
.replace("<", "\\u003C") .replace("<", "\\u003C")
.replace(">", "\\u003E") .replace(">", "\\u003E")
.replace("&", "\\u0026") .replace("&", "\\u0026")