Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-09-13 00:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix chat

Browse Source
This commit is contained in:
koalasat
2025-07-24 15:50:38 +02:00
parent b463c236c5
commit e951f8bb15
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,14 @@ class WebAppInterface(private val context: Context, private val webView: WebView
} }
private fun onWsMessage(path: String?, message: String?) { private fun onWsMessage(path: String?, message: String?) {
safeEvaluateJavascript("javascript:window.AndroidRobosats.onWSMessage('$path', '$message')") val escapedMessage = message
?.replace("\\", "\\\\") // Escape backslashes first
?.replace("'", "\\'") // Escape single quotes
?.replace("\"", "\\\"") // Escape double quotes
?.replace("\n", "\\n") // Escape newlines
?.replace("\r", "\\r") // Escape carriage returns
?.replace("\t", "\\t") // Escape tabs
safeEvaluateJavascript("javascript:window.AndroidRobosats.onWSMessage('$path', '$escapedMessage')")
} }
private fun onWsError(path: String?) { private fun onWsError(path: String?) {

8
frontend/src/basic/TopBar/NotificationsDrawer/index.tsx
View File

@ -23,7 +23,7 @@ import arraysAreDifferent from '../../../utils/array';
import getSettings from '../../../utils/settings'; import getSettings from '../../../utils/settings';
const path = const path =
getSettings().client == 'mobile' getSettings().client === 'mobile'
? 'file:///android_asset/static/assets/sounds' ? 'file:///android_asset/static/assets/sounds'
: '/static/assets/sounds'; : '/static/assets/sounds';
@ -98,12 +98,16 @@ const NotificationsDrawer = ({
const soundType = soundByStatus[orderStatus] ?? 'ding'; const soundType = soundByStatus[orderStatus] ?? 'ding';
const sound = audio[soundType]; const sound = audio[soundType];
console.log(sound);
void sound.play(); void sound.play();
}; };
const loadNotifciationsNostr = (): void => { const loadNotifciationsNostr = (): void => {
const tokens = Object.keys(garage.slots); const tokens = Object.keys(garage.slots);
if (!arraysAreDifferent(subscribedTokens, tokens)) return; if (!arraysAreDifferent(subscribedTokens, tokens)) {
setLoading(false);
return;
}
cleanUpNotifications(); cleanUpNotifications();
setSubscribedTokens(tokens); setSubscribedTokens(tokens);

4
frontend/src/components/TradeBox/EncryptedChat/EncryptedSocketChat/index.tsx
View File

@ -21,7 +21,7 @@ import { Send } from '@mui/icons-material';
const audioPath = const audioPath =
getSettings().client == 'mobile' getSettings().client == 'mobile'
? 'file:///android_asset//static/assets/sounds' ? 'file:///android_asset/static/assets/sounds'
: '/static/assets/sounds'; : '/static/assets/sounds';
interface Props { interface Props {
@ -135,7 +135,7 @@ const EncryptedSocketChat: React.FC<Props> = ({
); );
connection.onMessage((message) => { connection.onMessage((message) => {
setServerMessages((prev) => [...prev, message]); setServerMessages((prev) => [...prev, message as ServerMessage]);
}); });
connection.onClose(() => { connection.onClose(() => {
setConnected(false); setConnected(false);