PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed

Browse source 
Handle upload errors in voice messages
This commit is contained in:
Travis Ralston 2021-07-22 03:40:26 -06:00 committed by GitHub
commit 0bb0c8105d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/views/rooms/VoiceRecordComposerTile.tsx
View file

@ -68,7 +68,11 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
} }
await this.state.recorder.stop(); await this.state.recorder.stop();
try {
const upload = await this.state.recorder.upload(this.props.room.roomId); const upload = await this.state.recorder.upload(this.props.room.roomId);
// noinspection ES6MissingAwait - we don't care if it fails, it'll get queued.
MatrixClientPeg.get().sendMessage(this.props.room.roomId, { MatrixClientPeg.get().sendMessage(this.props.room.roomId, {
"body": "Voice message", "body": "Voice message",
//"msgtype": "org.matrix.msc2516.voice", //"msgtype": "org.matrix.msc2516.voice",
@ -99,6 +103,14 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
}, },
"org.matrix.msc3245.voice": {}, // No content, this is a rendering hint "org.matrix.msc3245.voice": {}, // No content, this is a rendering hint
}); });
} catch (e) {
console.error("Error sending/uploading voice message:", e);
Modal.createTrackedDialog('Upload failed', '', ErrorDialog, {
title: _t('Upload Failed'),
description: _t("The voice message failed to upload."),
});
return; // don't dispose the recording so the user can retry, maybe
}
await this.disposeRecording(); await this.disposeRecording();
} }

1
src/i18n/strings/en_EN.json
View file

@ -1678,6 +1678,7 @@
"Invited by %(sender)s": "Invited by %(sender)s", "Invited by %(sender)s": "Invited by %(sender)s",
"Jump to first unread message.": "Jump to first unread message.", "Jump to first unread message.": "Jump to first unread message.",
"Mark all as read": "Mark all as read", "Mark all as read": "Mark all as read",
"The voice message failed to upload.": "The voice message failed to upload.",
"Unable to access your microphone": "Unable to access your microphone", "Unable to access your microphone": "Unable to access your microphone",
"We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.", "We were unable to access your microphone. Please check your browser settings and try again.": "We were unable to access your microphone. Please check your browser settings and try again.",
"No microphone found": "No microphone found", "No microphone found": "No microphone found",

5
src/voice/VoiceRecording.ts
View file

@ -333,12 +333,17 @@ export class VoiceRecording extends EventEmitter implements IDestroyable {
if (this.lastUpload) return this.lastUpload; if (this.lastUpload) return this.lastUpload;
try {
this.emit(RecordingState.Uploading); this.emit(RecordingState.Uploading);
const { url: mxc, file: encrypted } = await uploadFile(this.client, inRoomId, new Blob([this.audioBuffer], { const { url: mxc, file: encrypted } = await uploadFile(this.client, inRoomId, new Blob([this.audioBuffer], {
type: this.contentType, type: this.contentType,
})); }));
this.lastUpload = { mxc, encrypted }; this.lastUpload = { mxc, encrypted };
this.emit(RecordingState.Uploaded); this.emit(RecordingState.Uploaded);
} catch (e) {
this.emit(RecordingState.Ended);
throw e;
}
return this.lastUpload; return this.lastUpload;
} }
} }