Skip to content
Snippets Groups Projects
Commit ee1aa0e9 authored by Jono Wenger's avatar Jono Wenger
Browse files

Fix parameters conversion for Javascript callbacks

parent 84ec5c21
No related branches found
No related tags found
1 merge request!6XX-4050 / Send E2E test
...@@ -67,7 +67,7 @@ type broadcastListener struct { ...@@ -67,7 +67,7 @@ type broadcastListener struct {
} }
func (bl *broadcastListener) Callback(payload []byte, err error) { func (bl *broadcastListener) Callback(payload []byte, err error) {
bl.callback(utils.CopyBytesToJS(payload), err.Error()) bl.callback(utils.CopyBytesToJS(payload), utils.JsTrace(err))
} }
// Listen registers a BroadcastListener for a given method. This allows users to // Listen registers a BroadcastListener for a given method. This allows users to
......
...@@ -181,8 +181,8 @@ type processor struct { ...@@ -181,8 +181,8 @@ type processor struct {
func (p *processor) Process( func (p *processor) Process(
message, receptionId []byte, ephemeralId, roundId int64) { message, receptionId []byte, ephemeralId, roundId int64) {
p.process(utils.CopyBytesToJS(message), utils.CopyBytesToJS(receptionId), ephemeralId, p.process(utils.CopyBytesToJS(message), utils.CopyBytesToJS(receptionId),
roundId) ephemeralId, roundId)
} }
func (p *processor) String() string { func (p *processor) String() string {
......
...@@ -56,7 +56,7 @@ type receiveFileCallback struct { ...@@ -56,7 +56,7 @@ type receiveFileCallback struct {
} }
func (rfc *receiveFileCallback) Callback(payload []byte, err error) { func (rfc *receiveFileCallback) Callback(payload []byte, err error) {
rfc.callback(utils.CopyBytesToJS(payload), err.Error()) rfc.callback(utils.CopyBytesToJS(payload), utils.JsTrace(err))
} }
// fileTransferSentProgressCallback wraps Javascript callbacks to adhere to the // fileTransferSentProgressCallback wraps Javascript callbacks to adhere to the
...@@ -67,7 +67,8 @@ type fileTransferSentProgressCallback struct { ...@@ -67,7 +67,8 @@ type fileTransferSentProgressCallback struct {
func (spc *fileTransferSentProgressCallback) Callback( func (spc *fileTransferSentProgressCallback) Callback(
payload []byte, t *bindings.FilePartTracker, err error) { payload []byte, t *bindings.FilePartTracker, err error) {
spc.callback(utils.CopyBytesToJS(payload), newFilePartTrackerJS(t), err.Error()) spc.callback(utils.CopyBytesToJS(payload), newFilePartTrackerJS(t),
utils.JsTrace(err))
} }
// fileTransferReceiveProgressCallback wraps Javascript callbacks to adhere to // fileTransferReceiveProgressCallback wraps Javascript callbacks to adhere to
...@@ -78,7 +79,8 @@ type fileTransferReceiveProgressCallback struct { ...@@ -78,7 +79,8 @@ type fileTransferReceiveProgressCallback struct {
func (rpc *fileTransferReceiveProgressCallback) Callback( func (rpc *fileTransferReceiveProgressCallback) Callback(
payload []byte, t *bindings.FilePartTracker, err error) { payload []byte, t *bindings.FilePartTracker, err error) {
rpc.callback(utils.CopyBytesToJS(payload), newFilePartTrackerJS(t), err.Error()) rpc.callback(utils.CopyBytesToJS(payload), newFilePartTrackerJS(t),
utils.JsTrace(err))
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
......
...@@ -357,8 +357,9 @@ type groupChatProcessor struct { ...@@ -357,8 +357,9 @@ type groupChatProcessor struct {
func (gcp *groupChatProcessor) Process(decryptedMessage, msg, func (gcp *groupChatProcessor) Process(decryptedMessage, msg,
receptionId []byte, ephemeralId, roundId int64, err error) { receptionId []byte, ephemeralId, roundId int64, err error) {
gcp.callback(utils.CopyBytesToJS(decryptedMessage), utils.CopyBytesToJS(msg), gcp.callback(utils.CopyBytesToJS(decryptedMessage),
utils.CopyBytesToJS(receptionId), ephemeralId, roundId, err.Error()) utils.CopyBytesToJS(msg), utils.CopyBytesToJS(receptionId), ephemeralId,
roundId, utils.JsTrace(err))
} }
func (gcp *groupChatProcessor) String() string { func (gcp *groupChatProcessor) String() string {
......
...@@ -22,7 +22,7 @@ type restlikeCallback struct { ...@@ -22,7 +22,7 @@ type restlikeCallback struct {
} }
func (rlc *restlikeCallback) Callback(payload []byte, err error) { func (rlc *restlikeCallback) Callback(payload []byte, err error) {
rlc.callback(utils.CopyBytesToJS(payload), err.Error()) rlc.callback(utils.CopyBytesToJS(payload), utils.JsTrace(err))
} }
// RequestRestLike sends a restlike request to a given contact. // RequestRestLike sends a restlike request to a given contact.
......
...@@ -115,7 +115,7 @@ type singleUseCallback struct { ...@@ -115,7 +115,7 @@ type singleUseCallback struct {
} }
func (suc *singleUseCallback) Callback(callbackReport []byte, err error) { func (suc *singleUseCallback) Callback(callbackReport []byte, err error) {
suc.callback(utils.CopyBytesToJS(callbackReport), err.Error()) suc.callback(utils.CopyBytesToJS(callbackReport), utils.JsTrace(err))
} }
// singleUseResponse wraps Javascript callbacks to adhere to the // singleUseResponse wraps Javascript callbacks to adhere to the
...@@ -125,5 +125,5 @@ type singleUseResponse struct { ...@@ -125,5 +125,5 @@ type singleUseResponse struct {
} }
func (sur *singleUseResponse) Callback(responseReport []byte, err error) { func (sur *singleUseResponse) Callback(responseReport []byte, err error) {
sur.callback(utils.CopyBytesToJS(responseReport), err.Error()) sur.callback(utils.CopyBytesToJS(responseReport), utils.JsTrace(err))
} }
...@@ -286,7 +286,7 @@ type udLookupCallback struct { ...@@ -286,7 +286,7 @@ type udLookupCallback struct {
} }
func (ulc *udLookupCallback) Callback(contactBytes []byte, err error) { func (ulc *udLookupCallback) Callback(contactBytes []byte, err error) {
ulc.callback(utils.CopyBytesToJS(contactBytes), err.Error()) ulc.callback(utils.CopyBytesToJS(contactBytes), utils.JsTrace(err))
} }
// LookupUD returns the public key of the passed ID as known by the user // LookupUD returns the public key of the passed ID as known by the user
...@@ -332,7 +332,7 @@ type udSearchCallback struct { ...@@ -332,7 +332,7 @@ type udSearchCallback struct {
} }
func (usc *udSearchCallback) Callback(contactListJSON []byte, err error) { func (usc *udSearchCallback) Callback(contactListJSON []byte, err error) {
usc.callback(utils.CopyBytesToJS(contactListJSON), err.Error()) usc.callback(utils.CopyBytesToJS(contactListJSON), utils.JsTrace(err))
} }
// SearchUD searches user discovery for the passed Facts. The searchCallback // SearchUD searches user discovery for the passed Facts. The searchCallback
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment