From 24d1f7f9b2951cd6bba9d9c588f6fba99bb2d050 Mon Sep 17 00:00:00 2001
From: OfficialDakari <officialdakari@extera.xyz>
Date: Fri, 14 Nov 2025 20:44:44 +0500
Subject: [PATCH] fix: import sticker packs

---
 .../settings_emotes/settings_emotes.dart      | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/lib/pages/settings_emotes/settings_emotes.dart b/lib/pages/settings_emotes/settings_emotes.dart
index 1964a80..3462acf 100644
--- a/lib/pages/settings_emotes/settings_emotes.dart
+++ b/lib/pages/settings_emotes/settings_emotes.dart
@@ -276,26 +276,16 @@ class EmotesSettingsController extends State<EmotesSettings> {
   }
 
   Future<void> importEmojiZip() async {
-    final result = await showFutureLoadingDialog<Archive?>(
-      context: context,
-      future: () async {
-        final result = await selectFiles(
-          context,
-          type: FileSelectorType.zip,
-        );
-
-        if (result.isEmpty) return null;
-
-        final buffer = await result.first.readAsBytes();
-
-        final archive = ZipDecoder().decodeBytes(buffer);
-
-        return archive;
-      },
+    final result = await selectFiles(
+      context,
+      type: FileSelectorType.zip,
     );
 
-    final archive = result.result;
-    if (archive == null) return;
+    if (result.isEmpty) return;
+
+    final buffer = InputMemoryStream(await result.single.readAsBytes());
+
+    final archive = ZipDecoder().decodeStream(buffer);
 
     await showDialog(
       context: context,
@@ -338,8 +328,6 @@ class EmotesSettingsController extends State<EmotesSettings> {
             '${pack.pack.displayName ?? client.userID?.localpart ?? 'emotes'}.zip';
         final output = ZipEncoder().encode(archive);
 
-        if (output == null) return;
-
         MatrixFile(
           name: fileName,
           bytes: Uint8List.fromList(output),