GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-02-26 03:10:43 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/play-audio' into 'main'

Browse Source 
fix: encrypted files

Closes #518 and #535

See merge request famedly/fluffychat!506
This commit is contained in:
Krille Fear 2021-08-29 15:16:26 +00:00
commit 328a61c288
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/utils/matrix_sdk_extensions.dart/event_extension.dart
View File

@ -87,9 +87,9 @@ extension LocalizedBody on Event {
Future<MatrixFile> downloadAndDecryptAttachmentCached( Future<MatrixFile> downloadAndDecryptAttachmentCached(
{bool getThumbnail = false}) async { {bool getThumbnail = false}) async {
final mxcUrl = attachmentOrThumbnailMxcUrl(getThumbnail: getThumbnail); final mxcUrl =
_downloadAndDecryptFutures[mxcUrl.toString()] ??= attachmentOrThumbnailMxcUrl(getThumbnail: getThumbnail).toString();
downloadAndDecryptAttachment( _downloadAndDecryptFutures[mxcUrl] ??= downloadAndDecryptAttachment(
getThumbnail: getThumbnail, getThumbnail: getThumbnail,
downloadCallback: (Uri url) async { downloadCallback: (Uri url) async {
final file = await DefaultCacheManager().getSingleFile(url.toString()); final file = await DefaultCacheManager().getSingleFile(url.toString());

2
lib/widgets/event_content/audio_player.dart
View File

@ -76,7 +76,7 @@ class _AudioPlayerState extends State<AudioPlayerWidget> {
Logs().v('Could not download audio file', e, s); Logs().v('Could not download audio file', e, s);
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text(e.toLocalizedString(context)), content: Text(e.toString()),
), ),
); );
} }

7
lib/widgets/event_content/image_bubble.dart
View File

@ -261,12 +261,11 @@ class _ImageBubbleState extends State<ImageBubble> {
widget.event.attachmentOrThumbnailMxcUrl(getThumbnail: true) == widget.event.attachmentOrThumbnailMxcUrl(getThumbnail: true) ==
widget.event.attachmentMxcUrl; widget.event.attachmentMxcUrl;
final key = isOriginal final key = isOriginal
? widget.event.attachmentMxcUrl ? widget.event.attachmentMxcUrl.toString()
: widget.event.thumbnailMxcUrl; : widget.event.thumbnailMxcUrl.toString();
final mimetype = getMimetype(!isOriginal); final mimetype = getMimetype(!isOriginal);
if (_contentRenderers.containsKey(mimetype)) { if (_contentRenderers.containsKey(mimetype)) {
return _contentRenderers[mimetype] return _contentRenderers[mimetype].memory(_displayFile.bytes, key);
.memory(_displayFile.bytes, key.toString());
} else { } else {
return Image.memory( return Image.memory(
_displayFile.bytes, _displayFile.bytes,