From 73aa8f58e3545c2f408edecacc3dee16d0015b47 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Thu, 27 May 2021 20:10:45 +0530 Subject: [PATCH] merge fixes Signed-off-by: Sahil Kumar --- .../lib/src/core/http/interceptor/logging_interceptor.dart | 4 ++-- .../stream_chat/lib/src/core/http/stream_http_client.dart | 1 - packages/stream_chat/lib/src/ws/websocket.dart | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/stream_chat/lib/src/core/http/interceptor/logging_interceptor.dart b/packages/stream_chat/lib/src/core/http/interceptor/logging_interceptor.dart index a9075e34..41c36326 100644 --- a/packages/stream_chat/lib/src/core/http/interceptor/logging_interceptor.dart +++ b/packages/stream_chat/lib/src/core/http/interceptor/logging_interceptor.dart @@ -309,12 +309,12 @@ class LoggingInterceptor extends Interceptor { }); } - bool _canFlattenMap(Map map) => +/* bool _canFlattenMap(Map map) => map.values.where((dynamic val) => val is Map || val is List).isEmpty && map.toString().length < maxWidth; bool _canFlattenList(List list) => - list.length < 10 && list.toString().length < maxWidth; + list.length < 10 && list.toString().length < maxWidth;*/ void _printMapAsTable( void Function(Object) logPrint, diff --git a/packages/stream_chat/lib/src/core/http/stream_http_client.dart b/packages/stream_chat/lib/src/core/http/stream_http_client.dart index ae0a5f72..43149714 100644 --- a/packages/stream_chat/lib/src/core/http/stream_http_client.dart +++ b/packages/stream_chat/lib/src/core/http/stream_http_client.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'dart:math'; import 'package:dio/dio.dart'; import 'package:logging/logging.dart'; diff --git a/packages/stream_chat/lib/src/ws/websocket.dart b/packages/stream_chat/lib/src/ws/websocket.dart index 0e19f9a6..6ebb7a7b 100644 --- a/packages/stream_chat/lib/src/ws/websocket.dart +++ b/packages/stream_chat/lib/src/ws/websocket.dart @@ -99,7 +99,7 @@ class WebSocket with TimerHelper { _connectionStatusController.add(status); /// The current connection status value - ConnectionStatus get connectionStatus => _connectionStatusController.value!; + ConnectionStatus get connectionStatus => _connectionStatusController.value; /// This notifies of connection status changes Stream get connectionStatusStream =>