Improved readability

CyBear-Jinni · Dec 9, 2023 · 7d7e532 · 7d7e532
1 parent 65b21d7
commit 7d7e532
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/domain/i_phone_as_hub.dart b/lib/domain/i_phone_as_hub.dart
@@ -2,7 +2,10 @@ import 'dart:async';
 
 import 'package:cbj_integrations_controller/domain/i_saved_devices_repo.dart';
 import 'package:cbj_integrations_controller/infrastructure/devices/companies_connector_conjecture.dart';
+import 'package:cbj_integrations_controller/infrastructure/devices/helper_methods/device_helper_methods.dart';
 import 'package:cbj_integrations_controller/infrastructure/generic_devices/abstract_device/device_entity_abstract.dart';
+import 'package:cbj_integrations_controller/infrastructure/hub_client/hub_client.dart';
+import 'package:cybear_jinni/infrastructure/core/logger.dart';
 
 import 'package:network_tools/network_tools.dart';
 

diff --git a/lib/infrastructure/mqtt.dart b/lib/infrastructure/mqtt.dart
@@ -1,7 +1,8 @@
 import 'dart:convert';
 
-import 'package:cbj_integrations_controller/domain/mqtt_server/i_mqtt_server_repository.dart';
-import 'package:cbj_integrations_controller/domain/rooms/i_saved_rooms_repo.dart';
+import 'package:cbj_integrations_controller/domain/i_mqtt_server_repository.dart';
+import 'package:cbj_integrations_controller/domain/i_saved_devices_repo.dart';
+import 'package:cbj_integrations_controller/domain/i_saved_rooms_repo.dart';
 import 'package:cbj_integrations_controller/infrastructure/devices/device_helper/device_helper.dart';
 import 'package:cbj_integrations_controller/infrastructure/gen/cbj_hub_server/protoc_as_dart/cbj_hub_server.pbgrpc.dart';
 import 'package:cbj_integrations_controller/infrastructure/generic_devices/abstract_device/device_entity_abstract.dart';
@@ -82,15 +83,15 @@ class MqttServerRepository extends IMqttServerRepository {
           EntityState(EntityStateGRPC.waitingInComp.toString());
 
       /// Sends directly to device connector conjecture
-      ConnectorDevicesStreamFromMqtt.fromMqttStream.add(deviceEntityAbstract);
+      ISavedDevicesRepo.instance.addOrUpdateFromMqtt(deviceEntityAbstract);
 
       return;
     } else if (entityFromTheApp is DeviceEntityAbstract) {
       entityFromTheApp.entityStateGRPC =
           EntityState(EntityStateGRPC.waitingInComp.toString());
 
       /// Sends directly to device connector conjecture
-      ConnectorDevicesStreamFromMqtt.fromMqttStream.add(entityFromTheApp);
+      // ConnectorDevicesStreamFromMqtt.fromMqttStream.add(entityFromTheApp);
     } else if (entityFromTheApp is RoomEntityDtos) {
       logger.i('Loop?');
       ISavedRoomsRepo.instance.addOrUpdateRoom(entityFromTheApp.toDomain());

diff --git a/lib/infrastructure/phone_as_hub.dart b/lib/infrastructure/phone_as_hub.dart
@@ -42,9 +42,6 @@ class _PhoneAsHubRepository implements IPhoneAsHub {
       return;
     }
     phoneAsHub = true;
-    CompaniesConnectorConjecture().updateAllDevicesReposWithDeviceChanges(
-      ConnectorDevicesStreamFromMqtt.fromMqttStream,
-    );
 
     AppRequestsToHub.appRequestsToHubStreamController.stream
         .listen((clientStatusRequests) {