0.7.7

README.md

@@ -7,7 +7,7 @@ Visit [homemade.systems](http://ha-client.homemade.systems/) for more info.
 
 Download the app from [Google Play](https://play.google.com/apps/testing/com.keyboardcrumbs.haclient)
 
-Discuss it in [Home Assistant community](https://community.home-assistant.io/t/alpha-testing-ha-client-native-android-client-for-home-assistant/69912) or on [Discord server](https://discord.gg/AUzEvwn)
+Discuss it on [Spectrum.chat](https://spectrum.chat/ha-client) or at [Home Assistant community](https://community.home-assistant.io/c/mobile-apps/ha-client-android)
 
 #### Pre-release CI build
 [![Codemagic build status](https://api.codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/status_badge.svg)](https://codemagic.io/apps/5da8bdab9f20ef798f7c2c65/5da8bdab9f20ef798f7c2c64/latest_build)

lib/home_assistant.class.dart

@@ -63,10 +63,6 @@ class HomeAssistant {
     futures.add(_getServices());
     futures.add(_getUserInfo());
     futures.add(_getPanels());
-    futures.add(ConnectionManager().sendSocketMessage(
-      type: "subscribe_events",
-      additionalData: {"event_type": "state_changed"},
-    ));
     Future.wait(futures).then((_) {
       if (isMobileAppEnabled) {
         if (!childMode) _createUI();
@@ -108,6 +104,7 @@ class HomeAssistant {
 
   Future _getLovelace() {
     Completer completer = Completer();
+
     ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) {
       _rawLovelaceData = data;
       completer.complete();
@@ -163,7 +160,7 @@ class HomeAssistant {
 
   void _handleEntityStateChange(Map eventData) {
     //TheLogger.debug( "New state for ${eventData['entity_id']}");
-    if (_fetchCompleter.isCompleted) {
+    if (_fetchCompleter != null && _fetchCompleter.isCompleted) {
       Map data = Map.from(eventData);
       eventBus.fire(new StateChangedEvent(
           entityId: data["entity_id"],

lib/main.dart

@@ -143,7 +143,7 @@ final SentryClient _sentry = SentryClient(dsn: "https://03ef364745cc4c23a60ddbc8
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersionNumber = "0.7.6";
+const appVersionNumber = "0.7.7";
 const appVersionAdd = "";
 const appVersion = "$appVersionNumber$appVersionAdd";
 

lib/managers/connection_manager.class.dart

@@ -148,11 +148,17 @@ class ConnectionManager {
                   });
                 } else if (data["type"] == "auth_ok") {
                   Logger.d("[Received] <== ${data.toString()}");
+                  Logger.d("[Connection] Subscribing to events");
+                  sendSocketMessage(
+                    type: "subscribe_events",
+                    additionalData: {"event_type": "state_changed"},
+                  ).whenComplete((){
                     _messageResolver["auth"]?.complete();
                     _messageResolver.remove("auth");
                     if (_token != null) {
                       if (!connecting.isCompleted) connecting.complete();
                     }
+                  });
                 } else if (data["type"] == "auth_invalid") {
                   Logger.d("[Received] <== ${data.toString()}");
                   _messageResolver["auth"]?.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));

lib/managers/location_manager.class.dart

@@ -149,15 +149,14 @@ class LocationManager {
 
 void updateDeviceLocationIsolate() {
   workManager.Workmanager.executeTask((backgroundTask, data) {
-    print("[Background $backgroundTask] Started");
+    //print("[Background $backgroundTask] Started");
-    final SentryClient sentryBackgroundClient = SentryClient(dsn: "https://5c868e5ef26947e2b61b189e391ec31b@sentry.io/1836366");
     Geolocator geolocator = Geolocator();
     var battery = Battery();
     int batteryLevel = 100;
     String webhookId = data["webhookId"];
     String httpWebHost = data["httpWebHost"];
     if (webhookId != null && webhookId.isNotEmpty) {
-        print("[Background $backgroundTask] hour=$battery");
+        //print("[Background $backgroundTask] hour=$battery");
         String url = "$httpWebHost/api/webhook/$webhookId";
         Map<String, String> headers = {};
         headers["Content-Type"] = "application/json";
@@ -169,15 +168,15 @@ void updateDeviceLocationIsolate() {
             "battery": batteryLevel
           }
         };
-        print("[Background $backgroundTask] Getting battery level...");
+        //print("[Background $backgroundTask] Getting battery level...");
         battery.batteryLevel.then((val) => data["data"]["battery"] = val).whenComplete((){
-          print("[Background $backgroundTask] Getting device location...");
+          //print("[Background $backgroundTask] Getting device location...");
           geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.high, locationPermissionLevel: GeolocationPermission.locationAlways).then((location) {
             if (location != null) {
-              print("[Background $backgroundTask] Got location: ${location.latitude} ${location.longitude}");
+              //print("[Background $backgroundTask] Got location: ${location.latitude} ${location.longitude}");
               data["data"]["gps"] = [location.latitude, location.longitude];
               data["data"]["gps_accuracy"] = location.accuracy;
-              print("[Background $backgroundTask] Sending data home.");
+              //print("[Background $backgroundTask] Sending data home.");
               http.post(
                   url,
                   headers: headers,
@@ -187,10 +186,7 @@ void updateDeviceLocationIsolate() {
               throw "Can't get device location. Location is null";
             }
           }).catchError((e) {
-            sentryBackgroundClient.captureException(
+            //print("[Background $backgroundTask] Error getting current location: ${e.toString()}");
-              exception: "${e.toString()}"
-            );
-            print("[Background $backgroundTask] Error getting current location: ${e.toString()}");
           });
         });
     }

lib/pages/main.page.dart

@@ -139,12 +139,6 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     }
     await HomeAssistant().fetchData().then((_) {
       _hideBottomBar();
-      int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
-      if (_previousViewCount != currentViewCount) {
-        Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
-        _viewsTabController = TabController(vsync: this, length: currentViewCount);
-        _previousViewCount = currentViewCount;
-      }
       if (_entityToShow != null) {
         _entityToShow = HomeAssistant().entities.get(_entityToShow.entityId);
       }
@@ -464,11 +458,11 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
         },
       ),
       new ListTile(
-        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:discord")),
+        leading: Icon(MaterialDesignIcons.getIconDataFromIconName("mdi:forum")),
-        title: Text("Join Discord channel"),
+        title: Text("Contacts/Discussion"),
         onTap: () {
           Navigator.of(context).pop();
-          Launcher.launchURL("https://discord.gg/AUzEvwn");
+          Launcher.launchURL("https://spectrum.chat/ha-client");
         },
       ),
       new AboutListTile(
@@ -643,6 +637,13 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
     List<PopupMenuItem<String>> serviceMenuItems = [];
     List<PopupMenuItem<String>> mediaMenuItems = [];
 
+    int currentViewCount = HomeAssistant().ui?.views?.length ?? 0;
+    if (_previousViewCount != currentViewCount) {
+      Logger.d("Views count changed ($_previousViewCount->$currentViewCount). Creating new tabs controller.");
+      _viewsTabController = TabController(vsync: this, length: currentViewCount);
+      _previousViewCount = currentViewCount;
+    }
+
     serviceMenuItems.add(PopupMenuItem<String>(
       child: new Text("Reload"),
       value: "reload",

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.7.6+760
+version: 0.7.7+770
 
 
 environment: