From 221c3ef6bd4318d1453a219876a4001a9d199427 Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Sat, 22 Feb 2025 12:17:50 +0100
Subject: [PATCH] chore: Better error handling for image rendering

---
 lib/pages/chat/send_file_dialog.dart | 58 ++++++++++++++++++++++------
 lib/widgets/mxc_image.dart           | 19 +++++++--
 2 files changed, 61 insertions(+), 16 deletions(-)

diff --git a/lib/pages/chat/send_file_dialog.dart b/lib/pages/chat/send_file_dialog.dart
index 2e522e44..42fad69b 100644
--- a/lib/pages/chat/send_file_dialog.dart
+++ b/lib/pages/chat/send_file_dialog.dart
@@ -1,7 +1,4 @@
-import 'dart:io';
-
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'package:cross_file/cross_file.dart';
@@ -219,15 +216,52 @@ class SendFileDialogState extends State<SendFileDialog> {
                                 AppConfig.borderRadius / 2,
                               ),
                               clipBehavior: Clip.hardEdge,
-                              child: kIsWeb
-                                  ? Image.network(
-                                      widget.files[i].path,
-                                      height: 256,
-                                    )
-                                  : Image.file(
-                                      File(widget.files[i].path),
-                                      height: 256,
-                                    ),
+                              child: FutureBuilder(
+                                future: widget.files[i].readAsBytes(),
+                                builder: (context, snapshot) {
+                                  final bytes = snapshot.data;
+                                  if (bytes == null) {
+                                    return const Center(
+                                      child:
+                                          CircularProgressIndicator.adaptive(),
+                                    );
+                                  }
+                                  if (snapshot.error != null) {
+                                    Logs().w(
+                                      'Unable to preview image',
+                                      snapshot.error,
+                                      snapshot.stackTrace,
+                                    );
+                                    return const Center(
+                                      child: SizedBox(
+                                        width: 256,
+                                        height: 256,
+                                        child: Icon(
+                                          Icons.broken_image_outlined,
+                                          size: 64,
+                                        ),
+                                      ),
+                                    );
+                                  }
+                                  return Image.memory(
+                                    bytes,
+                                    height: 256,
+                                    errorBuilder: (context, e, s) {
+                                      Logs().w('Unable to preview image', e, s);
+                                      return const Center(
+                                        child: SizedBox(
+                                          width: 256,
+                                          height: 256,
+                                          child: Icon(
+                                            Icons.broken_image_outlined,
+                                            size: 64,
+                                          ),
+                                        ),
+                                      );
+                                    },
+                                  );
+                                },
+                              ),
                             ),
                           ),
                         ),
diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart
index 230f3eb0..bdc938e7 100644
--- a/lib/widgets/mxc_image.dart
+++ b/lib/widgets/mxc_image.dart
@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:flutter/material.dart';
@@ -151,10 +152,20 @@ class _MxcImageState extends State<MxcImage> {
               fit: widget.fit,
               filterQuality:
                   widget.isThumbnail ? FilterQuality.low : FilterQuality.medium,
-              errorBuilder: (context, __, ___) {
-                _imageData = null;
-                WidgetsBinding.instance.addPostFrameCallback(_tryLoad);
-                return placeholder(context);
+              errorBuilder: (context, e, s) {
+                Logs().d('Unable to render mxc image', e, s);
+                return SizedBox(
+                  width: widget.width,
+                  height: widget.height,
+                  child: Material(
+                    color: Theme.of(context).colorScheme.surfaceContainer,
+                    child: Icon(
+                      Icons.broken_image_outlined,
+                      size: min(widget.height ?? 64, 64),
+                      color: Theme.of(context).colorScheme.onSurface,
+                    ),
+                  ),
+                );
               },
             )
           : SizedBox(