hamed/minor_refactor

Author: hamed-rezaee

lib/state/connection/connection_cubit.dart

@@ -75,14 +75,14 @@ class ConnectionCubit extends Cubit<ConnectionState> {
         onError: (String error) => emit(ConnectionErrorState(error)),
       );
 
-      _handleConnectionStatus(_api);
+      await _handleConnectionStatus(_api);
     } on Exception catch (e) {
       emit(ConnectionErrorState('$e'));
     }
   }
 
-  void _handleConnectionStatus(BaseAPI api) {
-    _cancelConnectionStatusSubscription();
+  Future<void> _handleConnectionStatus(BaseAPI api) async {
+    await _cancelConnectionStatusSubscription();
 
     _connectionStatusSubscription = api.connectionStatus.listen(
       (APIStatus status) {
@@ -101,15 +101,12 @@ class ConnectionCubit extends Cubit<ConnectionState> {
     );
   }
 
-  void _cancelConnectionStatusSubscription() {
-    if (_connectionStatusSubscription != null) {
-      _connectionStatusSubscription!.cancel();
-    }
-  }
+  Future<void> _cancelConnectionStatusSubscription() async =>
+      _connectionStatusSubscription?.cancel();
 
   @override
-  Future<void> close() {
-    _cancelConnectionStatusSubscription();
+  Future<void> close() async {
+    await _cancelConnectionStatusSubscription();
 
     return super.close();
   }