fix: connectivity ping issue

Author: sahani-deriv

lib/state/connection/connection_cubit.dart

@@ -32,13 +32,9 @@ class ConnectionCubit extends Cubit<ConnectionState> {
 
     _connectionInformation = connectionInformation;
 
-    if (_api is BinaryAPI) {
-      _setupConnectivityListener();
-    }
+    _connect(_connectionInformation);
 
     _startKeepAliveTimer();
-
-    _connect(_connectionInformation);
   }
 
   final String _key = '${UniqueKey()}';
@@ -74,6 +70,9 @@ class ConnectionCubit extends Cubit<ConnectionState> {
   /// Gets app id of websocket.
   static String get appId => _connectionInformation.appId;
 
+  /// Streamsubscription for connectivity.
+  StreamSubscription<ConnectivityResult>? connectivitySubscription;
+
   /// Reconnect to Websocket.
   Future<void> reconnect({ConnectionInformation? connectionInformation}) async {
     emit(const ConnectionDisconnectedState());
@@ -111,11 +110,9 @@ class ConnectionCubit extends Cubit<ConnectionState> {
           emit(const ConnectionConnectedState());
         }
       },
-      onDone: (String key) async {
+      onDone: (String key) {
         if (_key == key) {
-          await _api!.disconnect();
-
-          emit(const ConnectionDisconnectedState());
+          unawaited(reconnect());
         }
       },
       onError: (String key) {
@@ -124,28 +121,32 @@ class ConnectionCubit extends Cubit<ConnectionState> {
         }
       },
     );
+
+    if (_api is BinaryAPI) {
+      _setupConnectivityListener();
+    }
   }
 
-  void _setupConnectivityListener() =>
-      Connectivity().onConnectivityChanged.listen(
-        (ConnectivityResult status) async {
-          final bool isConnectedToNetwork =
-              status == ConnectivityResult.mobile ||
-                  status == ConnectivityResult.wifi;
-
-          if (isConnectedToNetwork) {
-            final bool isConnected = await _ping();
-
-            if (!isConnected) {
-              await reconnect();
-            }
-          } else if (status == ConnectivityResult.none) {
-            emit(const ConnectionDisconnectedState());
+  void _setupConnectivityListener() {
+    connectivitySubscription ??= Connectivity().onConnectivityChanged.listen(
+      (ConnectivityResult status) async {
+        final bool isConnectedToNetwork = status == ConnectivityResult.mobile ||
+            status == ConnectivityResult.wifi;
+
+        if (isConnectedToNetwork) {
+          final bool isConnected = await _ping();
+
+          if (!isConnected) {
+            await reconnect();
           }
-        },
-      );
+        } else if (status == ConnectivityResult.none) {
+          emit(const ConnectionDisconnectedState());
+        }
+      },
+    );
+  }
 
-  void _startKeepAliveTimer() {
+  Future<void> _startKeepAliveTimer() async {
     if (_connectivityTimer == null || !_connectivityTimer!.isActive) {
       _connectivityTimer =
           Timer.periodic(_connectivityCheckInterval, (Timer timer) => _ping());
@@ -156,7 +157,6 @@ class ConnectionCubit extends Cubit<ConnectionState> {
     try {
       final PingResponse response =
           await PingResponse.pingMethod().timeout(_pingTimeout);
-
       return response.ping == PingEnum.pong;
     } on Exception catch (_) {
       return false;
@@ -166,7 +166,8 @@ class ConnectionCubit extends Cubit<ConnectionState> {
   @override
   Future<void> close() {
     _connectivityTimer?.cancel();
-
+    connectivitySubscription?.cancel();
+    connectivitySubscription = null;
     return super.close();
   }
 }