Merge branch 'main' into personalDiets

lib/core/app_router.dart

@@ -374,10 +374,10 @@ class AppRouter {
         name: 'chatScreen',
         builder: (context, state) {
           final data = state.extra as Map<String, dynamic>;
-          final chatId = data['chatId'] as String;
+          final uuid = data['uuid'] as String;
           final sendInitialMessage = data['sendInitialMessage'] as bool?;
           return ChatScreen(
-            chatId: chatId,
+            uuid: uuid,
             sendInitialMessage: sendInitialMessage,
           );
         },

lib/core/locator_service.dart

@@ -250,7 +250,6 @@ Future<void> init() async {
           'accept': 'application/json',
           'content-type': 'application/json',
         },
-        validateStatus: (status) => status != null && status < 500,
       ),
     )..interceptors.addAll(
         [

lib/core/permission_handler/permission_handler.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/cupertino.dart';
@@ -11,6 +13,10 @@ class PermissionHandler {
     required Future<void> Function() onGranted,
     required BuildContext context,
   }) async {
+    if (Platform.isAndroid) {
+      await onGranted();
+      return;
+    }
     final permissionState = await permission.request();
     if (permissionState.isGranted) {
       await onGranted();

lib/core/token_storage.dart

@@ -21,3 +21,25 @@ abstract class TokenStorage {
 
   static Future<void> removeTokenInStorage() async => (await const FlutterSecureStorage().delete(key: 'token'));
 }
+
+abstract class SocketIdStorage {
+  static Future<bool> haveSocketIdInStorage() async {
+    try {
+      if (await const FlutterSecureStorage().read(key: 'socketId') == null) {
+        return false;
+      } else {
+        return true;
+      }
+    } catch (e) {
+      return false;
+    }
+  }
+
+  static Future<String?> getSocketIdFromStorage() async => await const FlutterSecureStorage().read(key: 'socketId');
+
+  static Future<void> saveSocketIdInStorage(String socketId) async {
+    await const FlutterSecureStorage().write(key: 'socketId', value: socketId);
+  }
+
+  static Future<void> removeSocketIdInStorage() async => (await const FlutterSecureStorage().delete(key: 'socketId'));
+}

lib/core/websockets/ws_manager.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:developer';
 
 import 'package:dart_pusher_channels/dart_pusher_channels.dart';
@@ -59,6 +60,24 @@ class WsManager {
           ),
         );
 
+        String? extractSocketId(String? data) {
+          if (data == null) return null;
+          try {
+            final decoded = jsonDecode(data);
+            return decoded['socket_id'] as String?;
+          } catch (_) {
+            return null;
+          }
+        }
+
+        client?.eventStream.listen((event) async {
+          if (event.name == 'pusher:connection_established') {
+            final data = event.data;
+            final socketId = extractSocketId(data);
+            await SocketIdStorage.saveSocketIdInStorage(socketId!);
+          }
+        });
+
         await client?.connect();
 
         client = client;
@@ -77,9 +96,8 @@ class WsManager {
           EasyDebounce.debounce(
             'searchChatRoom',
             const Duration(milliseconds: 300),
-                () => sl<ChatsCubit>().getChatRooms(),
+            () => sl<ChatsCubit>().getChatRooms(),
           );
-          log(event.rootObject.toString());
         });
         _subscribe();
       } catch (e, st) {