From b8aeb0e6ed06c52ac5ed612bd46f258657a73b04 Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Tue, 3 Jun 2025 13:16:41 +0200
Subject: [PATCH] fix #199

---
 .../save_to_gallery.dart                      | 109 ++++++++++--------
 .../views/camera/share_image_editor_view.dart |  10 +-
 lib/src/views/chats/media_viewer.view.dart    |   3 +-
 3 files changed, 67 insertions(+), 55 deletions(-)

diff --git a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart b/lib/src/views/camera/camera_preview_components/save_to_gallery.dart
index d4f2c43..c8c9bbd 100644
--- a/lib/src/views/camera/camera_preview_components/save_to_gallery.dart
+++ b/lib/src/views/camera/camera_preview_components/save_to_gallery.dart
@@ -7,19 +7,23 @@ import 'package:twonly/src/services/api/media_send.dart';
 import 'dart:typed_data';
 
 import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/utils/storage.dart';
 
 class SaveToGalleryButton extends StatefulWidget {
   final Future<Uint8List?> Function() getMergedImage;
   final String? sendNextMediaToUserName;
   final File? videoFilePath;
   final int? mediaUploadId;
+  final bool isLoading;
 
-  const SaveToGalleryButton(
-      {super.key,
-      required this.getMergedImage,
-      this.sendNextMediaToUserName,
-      this.mediaUploadId,
-      this.videoFilePath});
+  const SaveToGalleryButton({
+    super.key,
+    required this.getMergedImage,
+    required this.isLoading,
+    this.sendNextMediaToUserName,
+    this.mediaUploadId,
+    this.videoFilePath,
+  });
 
   @override
   State<SaveToGalleryButton> createState() => SaveToGalleryButtonState();
@@ -40,53 +44,62 @@ class SaveToGalleryButtonState extends State<SaveToGalleryButton> {
             ? Theme.of(context).colorScheme.outline
             : Theme.of(context).colorScheme.primary,
       ),
-      onPressed: () async {
-        setState(() {
-          _imageSaving = true;
-        });
+      onPressed: (widget.isLoading)
+          ? null
+          : () async {
+              setState(() {
+                _imageSaving = true;
+              });
 
-        String? res;
-        String memoryPath = await getMediaBaseFilePath("memories");
+              String? res;
+              String memoryPath = await getMediaBaseFilePath("memories");
 
-        if (widget.mediaUploadId != null) {
-          memoryPath = join(memoryPath, "${widget.mediaUploadId!}");
-        } else {
-          final Random random = Random();
-          String token = uint8ListToHex(
-              List<int>.generate(32, (i) => random.nextInt(256)));
-          memoryPath = join(memoryPath, token);
-        }
+              if (widget.mediaUploadId != null) {
+                memoryPath = join(memoryPath, "${widget.mediaUploadId!}");
+              } else {
+                final Random random = Random();
+                String token = uint8ListToHex(
+                    List<int>.generate(32, (i) => random.nextInt(256)));
+                memoryPath = join(memoryPath, token);
+              }
+              final user = await getUser();
+              if (user != null && (user.storeMediaFilesInGallery ?? true)) {}
+              bool storeToGallery = user?.storeMediaFilesInGallery ?? true;
 
-        if (widget.videoFilePath != null) {
-          memoryPath += ".mp4";
-          await File(widget.videoFilePath!.path).copy(memoryPath);
-          res = await saveVideoToGallery(widget.videoFilePath!.path);
-        } else {
-          memoryPath += ".png";
-          Uint8List? imageBytes = await widget.getMergedImage();
-          if (imageBytes == null || !mounted) return;
-          await File(memoryPath).writeAsBytes(imageBytes);
-          res = await saveImageToGallery(imageBytes);
-        }
-        if (res == null) {
-          setState(() {
-            _imageSaved = true;
-          });
-        } else if (mounted && context.mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(res),
-              duration: Duration(seconds: 3),
-            ),
-          );
-        }
-        setState(() {
-          _imageSaving = false;
-        });
-      },
+              if (widget.videoFilePath != null) {
+                memoryPath += ".mp4";
+                await File(widget.videoFilePath!.path).copy(memoryPath);
+                if (storeToGallery) {
+                  res = await saveVideoToGallery(widget.videoFilePath!.path);
+                }
+              } else {
+                memoryPath += ".png";
+                Uint8List? imageBytes = await widget.getMergedImage();
+                if (imageBytes == null || !mounted) return;
+                await File(memoryPath).writeAsBytes(imageBytes);
+                if (storeToGallery) {
+                  res = await saveImageToGallery(imageBytes);
+                }
+              }
+              if (res == null) {
+                setState(() {
+                  _imageSaved = true;
+                });
+              } else if (mounted && context.mounted) {
+                ScaffoldMessenger.of(context).showSnackBar(
+                  SnackBar(
+                    content: Text(res),
+                    duration: Duration(seconds: 3),
+                  ),
+                );
+              }
+              setState(() {
+                _imageSaving = false;
+              });
+            },
       child: Row(
         children: [
-          _imageSaving
+          (_imageSaving || widget.isLoading)
               ? SizedBox(
                   width: 12,
                   height: 12,
diff --git a/lib/src/views/camera/share_image_editor_view.dart b/lib/src/views/camera/share_image_editor_view.dart
index 80e6e3f..6170410 100644
--- a/lib/src/views/camera/share_image_editor_view.dart
+++ b/lib/src/views/camera/share_image_editor_view.dart
@@ -535,11 +535,11 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
                 SaveToGalleryButton(
-                  getMergedImage: getMergedImage,
-                  mediaUploadId: mediaUploadId,
-                  videoFilePath: widget.videoFilePath,
-                  sendNextMediaToUserName: sendNextMediaToUserName,
-                ),
+                    getMergedImage: getMergedImage,
+                    mediaUploadId: mediaUploadId,
+                    videoFilePath: widget.videoFilePath,
+                    sendNextMediaToUserName: sendNextMediaToUserName,
+                    isLoading: sendingOrLoadingImage),
                 if (sendNextMediaToUserName != null) SizedBox(width: 10),
                 if (sendNextMediaToUserName != null)
                   OutlinedButton(
diff --git a/lib/src/views/chats/media_viewer.view.dart b/lib/src/views/chats/media_viewer.view.dart
index a2cabe3..4f73b7b 100644
--- a/lib/src/views/chats/media_viewer.view.dart
+++ b/lib/src/views/chats/media_viewer.view.dart
@@ -277,7 +277,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
     });
   }
 
-  startTimer() {
+  void startTimer() {
     nextMediaTimer?.cancel();
     progressTimer?.cancel();
     nextMediaTimer = Timer(canBeSeenUntil!.difference(DateTime.now()), () {
@@ -323,7 +323,6 @@ class _MediaViewerViewState extends State<MediaViewerView> {
       imageSaved = true;
     });
     final user = await getUser();
-
     if (user != null && (user.storeMediaFilesInGallery ?? true)) {
       if (videoPath != null) {
         await saveVideoToGallery(videoPath!);