Resolves #494

0.7.6
Wrap empty navigate action
2019-11-29 13:40:51 +00:00 · 2019-11-29 13:02:22 +00:00 · 2019-11-29 12:45:59 +00:00 · 2019-11-29 11:27:59 +00:00 · 2019-11-29 11:24:29 +00:00 · 2019-11-29 11:21:45 +00:00
40 changed files with 587 additions and 412 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -7,35 +7,16 @@ assignees: ''

 ---

-<!-- 
-Please provide as much information as possible.
- -->
-**HA Client version:** <!-- Main app menu => About HA Client -->
+**HA Client version:** [Main menu -> About HA Client]

-**Home Assistant version:** <!-- 0.94.1 for example -->
+**Home Assistant version:**

-**Device name:** <!-- Pixel 2 for example -->
+**Device name:**

-**Android version:** <!-- 8.1 for example -->
-
-**Connection type:** <!-- For example "Local IP" or "Remote UI" or "Own domain"-->
-
-**Login type:** <!-- For example "HA Login" or "Manual token"-->
+**Android version:**

 **Description**
-<!-- 
-Describe your issue here
-->
+[Replace with description]

 **Screenshots**
-<!-- 
-Please provide screenshots if it is a UI issue. Also you can attach screenshot from Home Assistant web UI as an expected result
-->
-
-**Logs**
-<!-- 
-Right after issue reproduced go to app menu and tap "Log". Copy log with a "Copy" button in the upper-right corner and post it below
-->
-```
-[Replace this text with your logs] 
-```
+[Replace with screenshots]
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -3,11 +3,6 @@

    <uses-feature android:name="android.hardware.touchscreen"
        android:required="false" />
-
-    <!-- The INTERNET permission is required for development. Specifically,
-         flutter needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@ -15,6 +10,7 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>

+
    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
         calls FlutterMain.startInitialization(this); in its onCreate method.
         In most cases you can leave this as-is, but you if you want to provide
--- a/lib/cards/card_widget.dart
+++ b/lib/cards/card_widget.dart
@ -285,7 +285,9 @@ class CardWidget extends StatelessWidget {
    return Card(
        child: EntityModel(
            entityWrapper: card.linkedEntityWrapper,
-            child: EntityButtonCardBody(),
+            child: EntityButtonCardBody(
+              showName: card.showName,
+            ),
            handleTap: true
        )
    );
--- a/lib/cards/widgets/entity_button_card_body.widget.dart
+++ b/lib/cards/widgets/entity_button_card_body.widget.dart
@ -2,8 +2,10 @@ part of '../../main.dart';

 class EntityButtonCardBody extends StatelessWidget {

+  final bool showName;
+
  EntityButtonCardBody({
-    Key key,
+    Key key, this.showName: true,
  }) : super(key: key);

  @override
@ -39,13 +41,16 @@ class EntityButtonCardBody extends StatelessWidget {
  }

  Widget _buildName() {
-    return EntityName(
-      padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
-      textOverflow: TextOverflow.ellipsis,
-      maxLines: 3,
-      wordsWrap: true,
-      textAlign: TextAlign.center,
-      fontSize: Sizes.nameFontSize,
-    );
+    if (showName) {
+      return EntityName(
+        padding: EdgeInsets.fromLTRB(Sizes.buttonPadding, 0.0, Sizes.buttonPadding, Sizes.rowPadding),
+        textOverflow: TextOverflow.ellipsis,
+        maxLines: 3,
+        wordsWrap: true,
+        textAlign: TextAlign.center,
+        fontSize: Sizes.nameFontSize,
+      );
+    }
+    return Container(width: 0, height: 0);
  }
 }
--- a/lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart
+++ b/lib/entities/alarm_control_panel/widgets/alarm_control_panel_controls.widget.dart
@ -25,9 +25,12 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane


  void _callService(AlarmControlPanelEntity entity, String service) {
-    eventBus.fire(new ServiceCallEvent(
-          entity.domain, service, entity.entityId,
-          {"code": "$code"}));
+    ConnectionManager().callService(
+      domain: entity.domain,
+      service: service,
+      entityId: entity.entityId,
+      data: {"code": "$code"}
+    );
    setState(() {
      code = "";
    });
@ -58,7 +61,11 @@ class _AlarmControlPanelControlsWidgetWidgetState extends State<AlarmControlPane
            FlatButton(
              child: new Text("Yes"),
              onPressed: () {
-                eventBus.fire(new ServiceCallEvent(entity.domain, "alarm_trigger", entity.entityId, null));
+                ConnectionManager().callService(
+                  domain: entity.domain,
+                  service: "alarm_trigger",
+                  entityId: entity.entityId
+                );
                Navigator.of(context).pop();
              },
            ),
--- a/lib/entities/climate/widgets/climate_controls.dart
+++ b/lib/entities/climate/widgets/climate_controls.dart
@ -83,7 +83,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    _tempThrottleTimer = Timer(Duration(seconds: 2), () {
      setState(() {
        _changedHere = true;
-        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}));
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"temperature": "${_tmpTemperature.toStringAsFixed(1)}"}
+        );
        _resetStateTimer(entity);
      });
    });
@ -101,7 +106,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    _targetTempThrottleTimer = Timer(Duration(seconds: 2), () {
      setState(() {
        _changedHere = true;
-        eventBus.fire(new ServiceCallEvent(entity.domain, "set_temperature", entity.entityId,{"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}));
+        ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_temperature",
+          entityId: entity.entityId,
+          data: {"target_temp_high": "${_tmpTargetHigh.toStringAsFixed(1)}", "target_temp_low": "${_tmpTargetLow.toStringAsFixed(1)}"}
+        );
        _resetStateTimer(entity);
      });
    });
@ -111,7 +121,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpTargetHumidity = value.roundToDouble();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_humidity", entity.entityId,{"humidity": "$_tmpTargetHumidity"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_humidity",
+          entityId: entity.entityId,
+          data: {"humidity": "$_tmpTargetHumidity"}
+        );
      _resetStateTimer(entity);
    });
  }
@ -120,7 +135,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpHVACMode = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_hvac_mode", entity.entityId,{"hvac_mode": "$_tmpHVACMode"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_hvac_mode",
+          entityId: entity.entityId,
+          data: {"hvac_mode": "$_tmpHVACMode"}
+        );
      _resetStateTimer(entity);
    });
  }
@ -129,7 +149,12 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpSwingMode = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_swing_mode", entity.entityId,{"swing_mode": "$_tmpSwingMode"}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "set_swing_mode",
+          entityId: entity.entityId,
+          data: {"swing_mode": "$_tmpSwingMode"}
+        );
      _resetStateTimer(entity);
    });
  }
@ -138,7 +163,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpFanMode = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_fan_mode", entity.entityId,{"fan_mode": "$_tmpFanMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_fan_mode", entityId: entity.entityId, data: {"fan_mode": "$_tmpFanMode"});
      _resetStateTimer(entity);
    });
  }
@ -147,7 +172,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpPresetMode = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_preset_mode", entity.entityId,{"preset_mode": "$_tmpPresetMode"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_preset_mode", entityId: entity.entityId, data: {"preset_mode": "$_tmpPresetMode"});
      _resetStateTimer(entity);
    });
  }
@ -165,7 +190,7 @@ class _ClimateControlWidgetState extends State<ClimateControlWidget> {
    setState(() {
      _tmpAuxHeat = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_aux_heat", entity.entityId, {"aux_heat": "$_tmpAuxHeat"}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_aux_heat", entityId: entity.entityId, data: {"aux_heat": "$_tmpAuxHeat"});
      _resetStateTimer(entity);
    });
  }
--- a/lib/entities/cover/widgets/cover_controls.widget.dart
+++ b/lib/entities/cover/widgets/cover_controls.widget.dart
@ -18,7 +18,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
    setState(() {
      _tmpPosition = position.roundToDouble();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_position", entity.entityId,{"position": _tmpPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_position", entityId: entity.entityId, data: {"position": _tmpPosition.round()});
    });
  }

@ -26,7 +26,7 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {
    setState(() {
      _tmpTiltPosition = position.roundToDouble();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(entity.domain, "set_cover_tilt_position", entity.entityId,{"tilt_position": _tmpTiltPosition.round()}));
+      ConnectionManager().callService(domain: entity.domain, service: "set_cover_tilt_position", entityId: entity.entityId, data: {"tilt_position": _tmpTiltPosition.round()});
    });
  }

@ -135,18 +135,18 @@ class _CoverControlWidgetState extends State<CoverControlWidget> {

 class CoverTiltControlsWidget extends StatelessWidget {
  void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "open_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "open_cover_tilt", entityId: entity.entityId);
  }

  void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "close_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "close_cover_tilt", entityId: entity.entityId);
  }

  void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "stop_cover_tilt", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain, service: "stop_cover_tilt", entityId: entity.entityId);
  }

  @override
--- a/lib/entities/cover/widgets/cover_state.dart
+++ b/lib/entities/cover/widgets/cover_state.dart
@ -2,18 +2,27 @@ part of '../../../main.dart';

 class CoverStateWidget extends StatelessWidget {
  void _open(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "open_cover", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        service: "open_cover",
+        entityId: entity.entityId
+      );
  }

  void _close(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "close_cover", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        service: "close_cover",
+        entityId: entity.entityId
+      );
  }

  void _stop(CoverEntity entity) {
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "stop_cover", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        service: "stop_cover",
+        entityId: entity.entityId
+      );
  }

  @override
--- a/lib/entities/date_time/date_time_entity.class.dart
+++ b/lib/entities/date_time/date_time_entity.class.dart
@ -35,8 +35,7 @@ class DateTimeEntity extends Entity {
    return formattedState;
  }

-  void setNewState(newValue) {
-    eventBus
-        .fire(new ServiceCallEvent(domain, "set_datetime", entityId, newValue));
+  void setNewState(Map newValue) {
+    ConnectionManager().callService(domain: domain, service: "set_datetime", entityId: entityId, data: newValue);
  }
 }
--- a/lib/entities/entity.class.dart
+++ b/lib/entities/entity.class.dart
@ -153,7 +153,7 @@ class Entity {
    domain = rawData["entity_id"].split(".")[0];
    entityId = rawData["entity_id"];
    deviceClass = attributes["device_class"];
-    state = rawData["state"];
+    state = rawData["state"] is bool ? (rawData["state"] ? EntityState.on : EntityState.off) : rawData["state"];
    displayState = Entity.StateByDeviceClass["$deviceClass.$state"] ?? (state.toLowerCase() == 'unknown' ? '-' : state);
    _lastUpdated = DateTime.tryParse(rawData["last_updated"]);
    entityPicture = _getEntityPictureUrl(webHost);
--- a/lib/entities/entity_page_layout.widget.dart
+++ b/lib/entities/entity_page_layout.widget.dart
@ -17,7 +17,7 @@ class EntityPageLayout extends StatelessWidget {
            showClose ?
            Container(
              color: Colors.blue[300],
-              height: 36,
+              height: 40,
              child: Row(
                children: <Widget>[
                  Expanded(
@ -37,7 +37,7 @@ class EntityPageLayout extends StatelessWidget {
                    padding: EdgeInsets.all(0),
                    icon: Icon(Icons.close),
                    color: Colors.white,
-                    iconSize: 30.0,
+                    iconSize: 36.0,
                    onPressed: () {
                      eventBus.fire(ShowEntityPageEvent());
                    },
--- a/lib/entities/entity_wrapper.class.dart
+++ b/lib/entities/entity_wrapper.class.dart
@ -32,17 +32,17 @@ class EntityWrapper {
  void handleTap() {
    switch (uiAction.tapAction) {
      case EntityUIAction.toggle: {
-        eventBus.fire(
-            ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+        ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
        break;
      }

      case EntityUIAction.callService: {
        if (uiAction.tapService != null) {
-          eventBus.fire(
-              ServiceCallEvent(uiAction.tapService.split(".")[0],
-                  uiAction.tapService.split(".")[1], null,
-                  uiAction.tapServiceData));
+          ConnectionManager().callService(
+            domain: uiAction.tapService.split(".")[0],
+            service: uiAction.tapService.split(".")[1],
+            data: uiAction.tapServiceData
+          );
        }
        break;
      }
@ -58,7 +58,7 @@ class EntityWrapper {
      }

      case EntityUIAction.navigate: {
-        if (uiAction.tapService.startsWith("/")) {
+        if (uiAction.tapService != null && uiAction.tapService.startsWith("/")) {
          //TODO handle local urls
          Logger.w("Local urls is not supported yet");
        } else {
@ -76,17 +76,17 @@ class EntityWrapper {
  void handleHold() {
      switch (uiAction.holdAction) {
        case EntityUIAction.toggle: {
-          eventBus.fire(
-              ServiceCallEvent("homeassistant", "toggle", entity.entityId, null));
+          ConnectionManager().callService(domain: "homeassistant", service: "toggle", entityId: entity.entityId);
          break;
        }

        case EntityUIAction.callService: {
          if (uiAction.holdService != null) {
-            eventBus.fire(
-                ServiceCallEvent(uiAction.holdService.split(".")[0],
-                    uiAction.holdService.split(".")[1], null,
-                    uiAction.holdServiceData));
+            ConnectionManager().callService(
+              domain: uiAction.holdService.split(".")[0],
+              service: uiAction.holdService.split(".")[1],
+              data: uiAction.holdServiceData
+            );
          }
          break;
        }
@ -98,7 +98,7 @@ class EntityWrapper {
        }

        case EntityUIAction.navigate: {
-          if (uiAction.holdService.startsWith("/")) {
+          if (uiAction.holdService != null && uiAction.holdService.startsWith("/")) {
            //TODO handle local urls
            Logger.w("Local urls is not supported yet");
          } else {
--- a/lib/entities/fan/widgets/fan_controls.dart
+++ b/lib/entities/fan/widgets/fan_controls.dart
@ -24,9 +24,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
    setState(() {
      _tmpOscillate = oscillate;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          "fan", "oscillate", entity.entityId,
-          {"oscillating": oscillate}));
+      ConnectionManager().callService(
+          domain: "fan",
+          service: "oscillate",
+          entityId: entity.entityId,
+          data: {"oscillating": oscillate}
+        );
    });
  }

@ -34,9 +37,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
    setState(() {
      _tmpDirectionForward = forward;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          "fan", "set_direction", entity.entityId,
-          {"direction": forward ? "forward" : "reverse"}));
+      ConnectionManager().callService(
+          domain: "fan",
+          service: "set_direction",
+          entityId: entity.entityId,
+          data: {"direction": forward ? "forward" : "reverse"}
+        );
    });
  }

@ -44,9 +50,12 @@ class _FanControlsWidgetState extends State<FanControlsWidget> {
    setState(() {
      _tmpSpeed = value;
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-            "fan", "set_speed", entity.entityId,
-            {"speed": value}));
+      ConnectionManager().callService(
+            domain: "fan",
+            service: "set_speed",
+            entityId: entity.entityId,
+            data: {"speed": value}
+          );
    });
  }

--- a/lib/entities/flat_service_button.widget.dart
+++ b/lib/entities/flat_service_button.widget.dart
@ -18,7 +18,7 @@ class FlatServiceButton extends StatelessWidget {
  }) : super(key: key);

  void _setNewState() {
-    eventBus.fire(new ServiceCallEvent(serviceDomain, serviceName, entityId, null));
+    ConnectionManager().callService(domain: serviceDomain, service: serviceName, entityId: entityId);
  }

  @override
--- a/lib/entities/light/widgets/light_controls.dart
+++ b/lib/entities/light/widgets/light_controls.dart
@ -28,9 +28,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    setState(() {
      _tmpBrightness = value.round();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          entity.domain, "turn_on", entity.entityId,
-          {"brightness": _tmpBrightness}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"brightness": _tmpBrightness}
+        );
    });
  }

@ -38,9 +41,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    setState(() {
      _tmpWhiteValue = value.round();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            {"white_value": _tmpWhiteValue}));
+      ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"white_value": _tmpWhiteValue}
+          );

    });
  }
@ -49,9 +55,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    setState(() {
      _tmpColorTemp = value.round();
      _changedHere = true;
-      eventBus.fire(new ServiceCallEvent(
-          entity.domain, "turn_on", entity.entityId,
-          {"color_temp": _tmpColorTemp}));
+      ConnectionManager().callService(
+          domain: entity.domain,
+          service: "turn_on",
+          entityId: entity.entityId,
+          data: {"color_temp": _tmpColorTemp}
+        );
    });
  }

@ -59,10 +68,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
    setState(() {
      _tmpColor = color;
      _changedHere = true;
-      Logger.d( "HS Color: [${color.hue}, ${color.saturation}]");
-      eventBus.fire(new ServiceCallEvent(
-        entity.domain, "turn_on", entity.entityId,
-          {"hs_color": [color.hue, color.saturation*100]}));
+      ConnectionManager().callService(
+        domain: entity.domain,
+        service: "turn_on",
+        entityId: entity.entityId,
+        data: {"hs_color": [color.hue, color.saturation*100]}
+      );
    });
  }

@ -71,9 +82,12 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {
      _tmpEffect = value;
      _changedHere = true;
      if (_tmpEffect != null) {
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            {"effect": "$value"}));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId,
+            data: {"effect": "$value"}
+          );
      }
    });
  }
@ -227,8 +241,6 @@ class _LightControlsWidgetState extends State<LightControlsWidget> {

  Widget _buildEffectControl(LightEntity entity) {
    if ((entity.supportEffect) && (entity.effectList != null)) {
-      Logger.d("[LIGHT] entity effects: ${entity.effectList}");
-      Logger.d("[LIGHT] current effect: $_tmpEffect");
      List<String> list = List.from(entity.effectList);
      if (_tmpEffect!= null && !list.contains(_tmpEffect)) {
        list.insert(0, _tmpEffect);
--- a/lib/entities/lock/widgets/lock_state.dart
+++ b/lib/entities/lock/widgets/lock_state.dart
@ -7,11 +7,11 @@ class LockStateWidget extends StatelessWidget {
  const LockStateWidget({Key key, this.assumedState: false}) : super(key: key);

  void _lock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "lock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "lock", entityId: entity.entityId);
  }

  void _unlock(Entity entity) {
-    eventBus.fire(new ServiceCallEvent("lock", "unlock", entity.entityId, null));
+    ConnectionManager().callService(domain: "lock", service: "unlock", entityId: entity.entityId);
  }

  @override
--- a/lib/entities/media_player/media_player_entity.class.dart
+++ b/lib/entities/media_player/media_player_entity.class.dart
@ -84,25 +84,22 @@ class MediaPlayerEntity extends Entity {
  }

  bool canCalculateActualPosition() {
-    return positionLastUpdated != null && durationSeconds != null && positionSeconds != null && durationSeconds >= 0;
+    return positionLastUpdated != null && durationSeconds != null && positionSeconds != null && durationSeconds > 0;
  }

  double getActualPosition() {
    double result = 0;
-    if (canCalculateActualPosition()) {
-      Duration durationD;
-      Duration positionD;
-      durationD = Duration(seconds: durationSeconds);
-      positionD = Duration(
+    Duration durationD;
+    Duration positionD;
+    durationD = Duration(seconds: durationSeconds);
+    positionD = Duration(
          seconds: positionSeconds);
-      result = positionD.inSeconds.toDouble();
-      int differenceInSeconds = DateTime
+    result = positionD.inSeconds.toDouble();
+    int differenceInSeconds = DateTime
          .now()
          .difference(positionLastUpdated)
          .inSeconds;
-      result = ((result + differenceInSeconds) <= durationD.inSeconds) ? (result + differenceInSeconds) : durationD.inSeconds.toDouble();
-    }
-
+    result = ((result + differenceInSeconds) <= durationD.inSeconds) ? (result + differenceInSeconds) : durationD.inSeconds.toDouble();
    return result;

  }
--- a/lib/entities/media_player/widgets/media_player_progress_bar.widget.dart
+++ b/lib/entities/media_player/widgets/media_player_progress_bar.widget.dart
@ -22,13 +22,13 @@ class _MediaPlayerProgressBarState extends State<MediaPlayerProgressBar> {
  Widget build(BuildContext context) {
    final EntityModel entityModel = EntityModel.of(context);
    final MediaPlayerEntity entity = entityModel.entityWrapper.entity;
-    double progress;
+    double progress = 0;
    int currentPosition;
    if (entity.canCalculateActualPosition()) {
      currentPosition = entity.getActualPosition().toInt();
-      progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
-    } else {
-      progress = 0;
+      if (currentPosition > 0) {
+          progress = (currentPosition <= entity.durationSeconds) ? currentPosition / entity.durationSeconds : 100;
+      }
    }
    return LinearProgressIndicator(
      value: progress,
--- a/lib/entities/media_player/widgets/media_player_seek_bar.widget.dart
+++ b/lib/entities/media_player/widgets/media_player_seek_bar.widget.dart
@ -56,12 +56,12 @@ class _MediaPlayerSeekBarState extends State<MediaPlayerSeekBar> {
              color: Colors.orange,
              focusColor: Colors.white,
              onPressed: () {
-                eventBus.fire(ServiceCallEvent(
-                    "media_player",
-                    "media_seek",
-                    "${entity.entityId}",
-                    {"seek_position": _savedPosition}
-                ));
+                ConnectionManager().callService(
+                    domain: "media_player",
+                    service: "media_seek",
+                    entityId: entity.entityId,
+                    data: {"seek_position": _savedPosition}
+                );
                setState(() {
                  _savedPosition = 0;
                });
@ -103,12 +103,12 @@ class _MediaPlayerSeekBarState extends State<MediaPlayerSeekBar> {
                _seekStarted = false;
                Timer(Duration(milliseconds: 500), () {
                  if (!_seekStarted) {
-                    eventBus.fire(ServiceCallEvent(
-                        "media_player",
-                        "media_seek",
-                        "${entity.entityId}",
-                        {"seek_position": val}
-                    ));
+                    ConnectionManager().callService(
+                        domain: "media_player",
+                        service: "media_seek",
+                        entityId: entity.entityId,
+                        data: {"seek_position": val}
+                    );
                    setState(() {
                      _changedHere = true;
                      _currentPosition = val;
--- a/lib/entities/media_player/widgets/media_player_widgets.dart
+++ b/lib/entities/media_player/widgets/media_player_widgets.dart
@ -1,7 +1,7 @@
 part of '../../../main.dart';

 class MediaPlayerWidget extends StatelessWidget {
-  
+
  @override
  Widget build(BuildContext context) {
    final EntityModel entityModel = EntityModel.of(context);
@ -118,26 +118,28 @@ class MediaPlayerPlaybackControls extends StatelessWidget {


  void _setPower(MediaPlayerEntity entity) {
-    if (entity.state != EntityState.unavailable && entity.state != EntityState.unknown) {
      if (entity.state == EntityState.off) {
-        Logger.d("${entity.entityId} turn_on");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_on", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_on",
+            entityId: entity.entityId
+          );
      } else {
-        Logger.d("${entity.entityId} turn_off");
-        eventBus.fire(new ServiceCallEvent(
-            entity.domain, "turn_off", entity.entityId,
-            null));
+        ConnectionManager().callService(
+            domain: entity.domain,
+            service: "turn_off",
+            entityId: entity.entityId
+          );
      }
-    }
  }

  void _callAction(MediaPlayerEntity entity, String action) {
    Logger.d("${entity.entityId} $action");
-    eventBus.fire(new ServiceCallEvent(
-        entity.domain, "$action", entity.entityId,
-        null));
+    ConnectionManager().callService(
+        domain: entity.domain,
+        service: "$action",
+        entityId: entity.entityId
+      );
  }

  @override
@ -264,27 +266,50 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
    setState(() {
      _changedHere = true;
      _newVolumeLevel = value;
-      eventBus.fire(ServiceCallEvent("media_player", "volume_set", entityId, {"volume_level": value}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "volume_set",
+        entityId: entityId,
+        data: {"volume_level": value}
+      );
    });
  }

  void _setVolumeMute(bool isMuted, String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_mute", entityId, {"is_volume_muted": isMuted}));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_mute",
+      entityId: entityId,
+      data: {"is_volume_muted": isMuted}
+    );
  }

  void _setVolumeUp(String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_up", entityId, null));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_up",
+      entityId: entityId
+    );
  }

  void _setVolumeDown(String entityId) {
-    eventBus.fire(ServiceCallEvent("media_player", "volume_down", entityId, null));
+    ConnectionManager().callService(
+      domain: "media_player",
+      service: "volume_down",
+      entityId: entityId
+    );
  }

  void _setSoundMode(String value, String entityId) {
    setState(() {
      _newSoundMode = value;
      _changedHere = true;
-      eventBus.fire(ServiceCallEvent("media_player", "select_sound_mode", entityId, {"sound_mode": "$value"}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "select_sound_mode",
+        entityId: entityId,
+        data: {"sound_mode": "$value"}
+      );
    });
  }

@ -292,7 +317,12 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
    setState(() {
      _newSource = source;
      _changedHere = true;
-      eventBus.fire(ServiceCallEvent("media_player", "select_source", entityId, {"source": "$source"}));
+      ConnectionManager().callService(
+        domain: "media_player",
+        service: "select_source",
+        entityId: entityId,
+        data: {"source": "$source"}
+      );
    });
  }

@ -430,15 +460,15 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
  }

  void _duplicateTo(entity) {
-    HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
-    if (MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
-      Navigator.of(context).popAndPushNamed("/play-media", arguments: {"url": entity.attributes["media_content_id"], "type": entity.attributes["media_content_type"]});
+    if (entity.canCalculateActualPosition()) {
+        HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
    } else {
-      Navigator.of(context).pushNamed("/play-media", arguments: {
+        HomeAssistant().savedPlayerPosition = 0;
+    }
+    Navigator.of(context).pushNamed("/play-media", arguments: {
        "url": entity.attributes["media_content_id"],
        "type": entity.attributes["media_content_type"]
      });
-    }
  }

  void _switchTo(entity) {
--- a/lib/entities/select/widgets/select_state.dart
+++ b/lib/entities/select/widgets/select_state.dart
@ -11,8 +11,12 @@ class SelectStateWidget extends StatefulWidget {
 class _SelectStateWidgetState extends State<SelectStateWidget> {

  void setNewState(domain, entityId, newValue) {
-    eventBus.fire(new ServiceCallEvent(domain, "select_option", entityId,
-        {"option": "$newValue"}));
+    ConnectionManager().callService(
+      domain: domain,
+      service: "select_option",
+      entityId: entityId,
+      data: {"option": "$newValue"}
+    );
  }

  @override
--- a/lib/entities/slider/widgets/slider_controls.dart
+++ b/lib/entities/slider/widgets/slider_controls.dart
@ -18,8 +18,12 @@ class _SliderControlsWidgetState extends State<SliderControlsWidget> {
      _newValue = newValue;
      _changedHere = true;
    });
-    eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
-        {"value": "${newValue.toString()}"}));
+    ConnectionManager().callService(
+      domain: domain,
+      service: "set_value",
+      entityId: entityId,
+      data: {"value": "${newValue.toString()}"}
+    );
  }

  @override
--- a/lib/entities/switch/widget/switch_state.dart
+++ b/lib/entities/switch/widget/switch_state.dart
@ -38,8 +38,11 @@ class _SwitchStateWidgetState extends State<SwitchStateWidget> {
    } else {
      domain = entity.domain;
    }
-    eventBus.fire(new ServiceCallEvent(
-        domain, (newValue as bool) ? "turn_on" : "turn_off", entity.entityId, null));
+    ConnectionManager().callService(
+        domain: domain,
+        service: (newValue as bool) ? "turn_on" : "turn_off",
+        entityId: entity.entityId
+      );
  }

  @override
--- a/lib/entities/text/widgets/text_input_state.dart
+++ b/lib/entities/text/widgets/text_input_state.dart
@ -26,8 +26,12 @@ class _TextInputStateWidgetState extends State<TextInputStateWidget> {

  void setNewState(newValue, domain, entityId) {
    if (validate(newValue, _minLength, _maxLength)) {
-      eventBus.fire(new ServiceCallEvent(domain, "set_value", entityId,
-          {"value": "$newValue"}));
+      ConnectionManager().callService(
+        domain: domain,
+        service: "set_value",
+        entityId: entityId,
+        data: {"value": "$newValue"}
+      );
    } else {
      setState(() {
        _tmpValue = _entityState;
--- a/lib/entities/vacuum/widgets/vacuum_controls.dart
+++ b/lib/entities/vacuum/widgets/vacuum_controls.dart
@ -197,7 +197,7 @@ class VacuumControls extends StatelessWidget {
                domain: "vacuum",
                entityId: entity.entityId,
                service: "set_fan_speed",
-                additionalServiceData: {"fan_speed": val}
+                data: {"fan_speed": val}
            )
        ),
      );
--- a/lib/home_assistant.class.dart
+++ b/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();
@ -106,10 +102,20 @@ class HomeAssistant {
    });
  }

-  Future _getLovelace() async {
-    await ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) => _rawLovelaceData = data).catchError((e) {
-      throw HAError("Error getting lovelace config: $e");
+  Future _getLovelace() {
+    Completer completer = Completer();
+    ConnectionManager().sendSocketMessage(type: "lovelace/config").then((data) {
+      _rawLovelaceData = data;
+      completer.complete();
+    }).catchError((e) {
+      if ("$e" == "config_not_found") {
+        ConnectionManager().useLovelace = false;
+        completer.complete();
+      } else {
+        completer.completeError(HAError("Error getting lovelace config: $e"));
+      }
    });
+    return completer.future;
  }

  Future _getUserInfo() async {
@ -125,7 +131,6 @@ class HomeAssistant {
  Future _getServices() async {
    await ConnectionManager().sendSocketMessage(type: "get_services").then((data) {
      Logger.d("Got ${data.length} services");
-      Logger.d("Media extractor: ${data["media_extractor"]}");
      services = data;
    }).catchError((e) {
      Logger.w("Can't get services: $e");
@ -180,9 +185,17 @@ class HomeAssistant {

        if (rawView['badges'] != null && rawView['badges'] is List) {
          rawView['badges'].forEach((entity) {
-            if (entities.isExist(entity)) {
-              Entity e = entities.get(entity);
-              view.badges.add(e);
+            if (entity is String) {
+              if (entities.isExist(entity)) {
+                Entity e = entities.get(entity);
+                view.badges.add(e);
+              }
+            } else {
+              String eId = '${entity['entity']}';
+              if (entities.isExist(eId)) {
+                Entity e = entities.get(eId);
+                view.badges.add(e);
+              }
            }
          });
        }
@ -206,10 +219,10 @@ class HomeAssistant {
            name: rawCardInfo["title"] ?? rawCardInfo["name"],
            type: rawCardInfo['type'] ?? CardType.ENTITIES,
            columnsCount: rawCardInfo['columns'] ?? 4,
-            showName: rawCardInfo['show_name'] ?? true,
-            showState: rawCardInfo['show_state'] ?? true,
-            showEmpty: rawCardInfo['show_empty'] ?? true,
-            stateFilter: rawCardInfo['state_filter'] ?? [],
+            showName: (rawCardInfo['show_name'] ?? rawCard['show_name']) ?? true,
+            showState: (rawCardInfo['show_state'] ?? rawCard['show_state']) ?? true,
+            showEmpty: (rawCardInfo['show_empty'] ?? rawCard['show_empty']) ?? true,
+            stateFilter: (rawCard['state_filter'] ?? rawCardInfo['state_filter']) ?? [],
            states: rawCardInfo['states'],
            conditions: rawCard['conditions'] ?? [],
            content: rawCardInfo['content'],
--- a/lib/main.dart
+++ b/lib/main.dart
@ -30,6 +30,7 @@ import 'package:uni_links/uni_links.dart';
 import 'package:workmanager/workmanager.dart' as workManager;
 import 'package:geolocator/geolocator.dart';
 import 'package:battery/battery.dart';
+import 'package:sentry/sentry.dart';

 import 'utils/logger.dart';

@ -138,34 +139,46 @@ part 'entities/media_player/widgets/media_player_progress_bar.widget.dart';
 part 'pages/whats_new.page.dart';

 EventBus eventBus = new EventBus();
+final SentryClient _sentry = SentryClient(dsn: "https://03ef364745cc4c23a60ddbc874c69925@sentry.io/1836118");
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersionNumber = "0.7.0";
+const appVersionNumber = "0.7.6";
 const appVersionAdd = "";
-const appVersion = "$appVersionNumber-$appVersionAdd";
+const appVersion = "$appVersionNumber$appVersionAdd";
+
+Future<void> _reportError(dynamic error, dynamic stackTrace) async {
+    // Print the exception to the console.
+    if (Logger.isInDebugMode) {
+      Logger.e('Caught error: $error');
+      Logger.p(stackTrace);
+      return;
+    } else {
+      Logger.e('Caught error: $error. Reporting to Senrty.');
+      // Send the Exception and Stacktrace to Sentry in Production mode.
+      _sentry.captureException(
+        exception: error,
+        stackTrace: stackTrace,
+      );
+    }
+}

 void main() async {
-  FlutterError.onError = (errorDetails) {
-    Logger.e( "${errorDetails.exception}");
+  FlutterError.onError = (FlutterErrorDetails details) {
+    Logger.e(" Caut Flutter runtime error: ${details.exception}");
    if (Logger.isInDebugMode) {
-      FlutterError.dumpErrorToConsole(errorDetails);
+      FlutterError.dumpErrorToConsole(details);
+    } else {
+      // In production mode, report to the application zone to report to
+      // Sentry.
+      Zone.current.handleUncaughtError(details.exception, details.stack);
    }
  };

  runZoned(() {
-      workManager.Workmanager.initialize(
-        updateDeviceLocationIsolate,
-        isInDebugMode: false
-      );
      runApp(new HAClientApp());
-
  }, onError: (error, stack) {
-    Logger.e("$error");
-    Logger.e("$stack");
-    if (Logger.isInDebugMode) {
-      debugPrint("$stack");
-    }
+    _reportError(error, stack);
  });
 }

@ -194,4 +207,4 @@ class HAClientApp extends StatelessWidget {
      },
    );
  }
-}
+}
--- a/lib/managers/connection_manager.class.dart
+++ b/lib/managers/connection_manager.class.dart
@ -98,16 +98,23 @@ class ConnectionManager {

  void _doConnect({Completer completer, bool forceReconnect}) {
    if (forceReconnect || !isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: () {
-        _disconnect().then((_) {
-          if (completer != null && !completer.isCompleted) {
-            completer.completeError(HAError("Connection timeout"));
-          }
+      _disconnect().then((_){
+        _connect().timeout(connectTimeout).then((_) {
+          completer?.complete();
+        }).catchError((e) {
+          _disconnect().then((_) {
+            if (e is TimeoutException) {
+              if (connecting != null && !connecting.isCompleted) {
+                connecting.completeError(HAError("Connection timeout"));
+              }
+              completer?.completeError(HAError("Connection timeout"));
+            } else if (e is HAError) {
+              completer?.completeError(e);
+            } else {
+              completer?.completeError(HAError("${e.toString()}"));
+            }
+          });
        });
-      }).then((_) {
-        completer?.complete();
-      }).catchError((e) {
-        completer?.completeError(e);
      });
    } else {
      completer?.complete();
@ -124,40 +131,50 @@ class ConnectionManager {
      connecting = Completer();
      _disconnect().then((_) {
        Logger.d("Socket connecting...");
-        _socket = IOWebSocketChannel.connect(
+        try {
+          _socket = IOWebSocketChannel.connect(
            _webSocketAPIEndpoint, pingInterval: Duration(seconds: 15));
-        _socketSubscription = _socket.stream.listen(
-                (message) {
-              isConnected = true;
-              var data = json.decode(message);
-              if (data["type"] == "auth_required") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _authenticate().then((_) {
-                  Logger.d('Authentication complete');
-                  connecting.complete();
-                }).catchError((e) {
-                  if (!connecting.isCompleted) connecting.completeError(e);
-                });
-              } else if (data["type"] == "auth_ok") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _messageResolver["auth"]?.complete();
-                _messageResolver.remove("auth");
-                if (_token != null) {
-                  if (!connecting.isCompleted) connecting.complete();
+          _socketSubscription = _socket.stream.listen(
+                  (message) {
+                isConnected = true;
+                var data = json.decode(message);
+                if (data["type"] == "auth_required") {
+                  Logger.d("[Received] <== ${data.toString()}");
+                  _authenticate().then((_) {
+                    Logger.d('Authentication complete');
+                    connecting.complete();
+                  }).catchError((e) {
+                    if (!connecting.isCompleted) connecting.completeError(e);
+                  });
+                } 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()]));
+                  _messageResolver.remove("auth");
+                  if (!connecting.isCompleted) connecting.completeError(HAError("${data["message"]}", actions: [HAErrorAction.tryAgain(title: "Retry"), HAErrorAction.loginAgain(title: "Relogin")]));
+                } else {
+                  _handleMessage(data);
                }
-              } else if (data["type"] == "auth_invalid") {
-                Logger.d("[Received] <== ${data.toString()}");
-                _messageResolver["auth"]?.completeError(HAError("${data["message"]}", actions: [HAErrorAction.loginAgain()]));
-                _messageResolver.remove("auth");
-                if (!connecting.isCompleted) connecting.completeError(HAError("${data["message"]}", actions: [HAErrorAction.tryAgain(title: "Retry"), HAErrorAction.loginAgain(title: "Relogin")]));
-              } else {
-                _handleMessage(data);
-              }
-            },
-            cancelOnError: true,
-            onDone: () => _handleSocketClose(connecting),
-            onError: (e) => _handleSocketError(e, connecting)
-        );
+              },
+              cancelOnError: true,
+              onDone: () => _handleSocketClose(connecting),
+              onError: (e) => _handleSocketError(e, connecting)
+          );
+        } catch(exeption) {
+          connecting.completeError(HAError("${exeption.toString()}"));
+        }
      });
      return connecting.future;
    }
@ -189,13 +206,13 @@ class ConnectionManager {
        //Logger.d("[Received] <== Request id ${data['id']} was successful");
        _messageResolver["${data["id"]}"]?.complete(data["result"]);
      } else if (data["id"] != null) {
-        //Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
-        _messageResolver["${data["id"]}"]?.completeError("${data['error']["message"]}");
+        Logger.e("[Received] <== Error received on request id ${data['id']}: ${data['error']}");
+        _messageResolver["${data["id"]}"]?.completeError("${data["error"]["code"]}");
      }
      _messageResolver.remove("${data["id"]}");
    } else if (data["type"] == "event") {
      if ((data["event"] != null) && (data["event"]["event_type"] == "state_changed")) {
-        //Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
+        Logger.d("[Received] <== ${data['type']}.${data["event"]["event_type"]}: ${data["event"]["data"]["entity_id"]}");
        onStateChangeCallback(data["event"]["data"]);
      } else if (data["event"] != null) {
        Logger.w("Unhandled event type: ${data["event"]["event_type"]}");
@ -209,38 +226,24 @@ class ConnectionManager {

  void _handleSocketClose(Completer connectionCompleter) {
    Logger.d("Socket disconnected.");
-    if (!connectionCompleter.isCompleted) {
-      isConnected = false;
-      connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
-            eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));
-          });
-        });
-      });
-    }
+    _disconnect().then((_) {
+      if (!connectionCompleter.isCompleted) {
+        isConnected = false;
+        connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
+      }
+      eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
+    });
  }

  void _handleSocketError(e, Completer connectionCompleter) {
    Logger.e("Socket stream Error: $e");
-    if (!connectionCompleter.isCompleted) {
-      isConnected = false;
-      connectionCompleter.completeError(HAError("Unable to connect to Home Assistant"));
-    } else {
-      _disconnect().then((_) {
-        Timer(Duration(seconds: 5), () {
-          Logger.d("Trying to reconnect...");
-          _connect().catchError((e) {
-            isConnected = false;
-            eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));
-          });
-        });
-      });
-    }
+    _disconnect().then((_) {
+      if (!connectionCompleter.isCompleted) {
+        isConnected = false;
+        connectionCompleter.completeError(HAError("Disconnected", actions: [HAErrorAction.reconnect()]));
+      }
+      eventBus.fire(ShowErrorEvent(HAError("Unable to connect to Home Assistant")));  
+    });
  }

  Future _authenticate() {
@ -329,13 +332,13 @@ class ConnectionManager {
    _messageResolver[callbackName] = _completer;
    String rawMessage = json.encode(dataObject);
    if (!isConnected) {
-      _connect().timeout(connectTimeout, onTimeout: (){
-        _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
-      }).then((_) {
+      _connect().timeout(connectTimeout).then((_) {
        Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
        _socket.sink.add(rawMessage);
      }).catchError((e) {
-        _completer.completeError(e);
+        if (!_completer.isCompleted) {
+          _completer.completeError(HAError("No connection to Home Assistant", actions: [HAErrorAction.reconnect()]));
+        }
      });
    } else {
      Logger.d("[Sending] ==> ${auth ? "type="+dataObject['type'] : rawMessage}");
@ -348,25 +351,27 @@ class ConnectionManager {
    _currentMessageId += 1;
  }

-  Future callService({String domain, String service, String entityId, Map additionalServiceData}) {
+  Future callService({@required String domain, @required String service, String entityId, Map data}) {
+    eventBus.fire(NotifyServiceCallEvent(domain, service, entityId));
+    Logger.d("Service call: $domain.$service, $entityId, $data");
    Completer completer = Completer();
    Map serviceData = {};
    if (entityId != null) {
      serviceData["entity_id"] = entityId;
    }
-    if (additionalServiceData != null && additionalServiceData.isNotEmpty) {
-      serviceData.addAll(additionalServiceData);
+    if (data != null && data.isNotEmpty) {
+      serviceData.addAll(data);
    }
    if (serviceData.isNotEmpty)
      sendHTTPPost(
        endPoint: "/api/services/$domain/$service",
        data: json.encode(serviceData)
-      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError("${e["message"]}")));
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service, "service_data": serviceData});
    else
      sendHTTPPost(
          endPoint: "/api/services/$domain/$service"
-      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError("${e["message"]}")));;
+      ).then((data) => completer.complete(data)).catchError((e) => completer.completeError(HAError(e.toString())));
      //return sendSocketMessage(type: "call_service", additionalData: {"domain": domain, "service": service});
    return completer.future;
  }
@ -407,11 +412,12 @@ class ConnectionManager {
        headers: headers,
        body: data
    ).then((response) {
-      Logger.d("[Received] <== HTTP ${response.statusCode}");
      if (response.statusCode >= 200 && response.statusCode < 300 ) {
+        Logger.d("[Received] <== HTTP ${response.statusCode}");
        completer.complete(response.body);
      } else {
-        completer.completeError({"code": response.statusCode, "message": "${response.body}"});
+        Logger.d("[Received] <== HTTP ${response.statusCode}: ${response.body}");
+        completer.completeError(response);
      }
    }).catchError((e) {
      completer.completeError(e);
--- a/lib/managers/location_manager.class.dart
+++ b/lib/managers/location_manager.class.dart
@ -14,7 +14,7 @@ class LocationManager {
  }

  final int defaultUpdateIntervalMinutes = 20;
-  final String backgroundTaskId = "haclocationtask4352";
+  final String backgroundTaskId = "haclocationtask0";
  final String backgroundTaskTag = "haclocation";
  Duration _updateInterval;
  bool _isRunning;
@ -57,27 +57,48 @@ class LocationManager {
  }

  _startLocationService() async {
-    Logger.d("Scheduling location update for every ${_updateInterval
-        .inMinutes} minutes...");
    String webhookId = ConnectionManager().webhookId;
    String httpWebHost = ConnectionManager().httpWebHost;
    if (webhookId != null && webhookId.isNotEmpty) {
-      await workManager.Workmanager.registerPeriodicTask(
-        backgroundTaskId,
-        "haClientLocationTracking",
-        tag: backgroundTaskTag,
-        inputData: {
-          "webhookId": webhookId,
-          "httpWebHost": httpWebHost
-        },
-        frequency: _updateInterval,
-        existingWorkPolicy: workManager.ExistingWorkPolicy.keep,
-        backoffPolicy: workManager.BackoffPolicy.linear,
-        backoffPolicyDelay: _updateInterval,
-        constraints: workManager.Constraints(
-          networkType: workManager.NetworkType.connected
-        )
-      );
+      Duration interval;
+      int delayFactor;
+      int taskCount;
+      Logger.d("Starting location update for every ${_updateInterval
+        .inMinutes} minutes...");
+      if (_updateInterval.inMinutes == 10) {
+        interval = Duration(minutes: 20);
+        taskCount = 2;
+        delayFactor = 10;
+      } else if (_updateInterval.inMinutes == 5) {
+        interval = Duration(minutes: 15);
+        taskCount = 3;
+        delayFactor = 5;
+      } else {
+        interval = _updateInterval;
+        taskCount = 1;
+        delayFactor = 0;
+      }
+      for (int i = 1; i <= taskCount; i++) {
+        int delay = i*delayFactor;
+        Logger.d("Scheduling location update task #$i for every ${interval.inMinutes} minutes in $delay minutes...");
+        await workManager.Workmanager.registerPeriodicTask(
+          "$backgroundTaskId$i",
+          "haClientLocationTracking-0$i",
+          tag: backgroundTaskTag,
+          inputData: {
+            "webhookId": webhookId,
+            "httpWebHost": httpWebHost
+          },
+          frequency: interval,
+          initialDelay: Duration(minutes: delay),
+          existingWorkPolicy: workManager.ExistingWorkPolicy.keep,
+          backoffPolicy: workManager.BackoffPolicy.linear,
+          backoffPolicyDelay: interval,
+          constraints: workManager.Constraints(
+            networkType: workManager.NetworkType.connected
+          )
+        );
+      }
    }
  }

@ -87,32 +108,40 @@ class LocationManager {
  }

  updateDeviceLocation() async {
-    if (ConnectionManager().webhookId != null &&
-          ConnectionManager().webhookId.isNotEmpty) {
-        String url = "${ConnectionManager()
-            .httpWebHost}/api/webhook/${ConnectionManager().webhookId}";
-        Map<String, String> headers = {};
-        Logger.d("[Location] Getting device location...");
-        Position location = await Geolocator().getCurrentPosition(
-            desiredAccuracy: LocationAccuracy.medium);
-        Logger.d("[Location] Got location: ${location.latitude} ${location
-            .longitude}. Sending home...");
-        int battery = await Battery().batteryLevel;
-        var data = {
-          "type": "update_location",
-          "data": {
-            "gps": [location.latitude, location.longitude],
-            "gps_accuracy": location.accuracy,
-            "battery": battery
-          }
-        };
-        headers["Content-Type"] = "application/json";
-        await http.post(
+    Logger.d("[Foreground location] Started");
+    Geolocator geolocator = Geolocator();
+    var battery = Battery();
+    String webhookId = ConnectionManager().webhookId;
+    String httpWebHost = ConnectionManager().httpWebHost;
+    if (webhookId != null && webhookId.isNotEmpty) {
+        Logger.d("[Foreground location] Getting battery level...");
+        int batteryLevel = await battery.batteryLevel;
+        Logger.d("[Foreground location] Getting device location...");
+        Position position = await geolocator.getCurrentPosition(
+            desiredAccuracy: LocationAccuracy.high,
+            locationPermissionLevel: GeolocationPermission.locationAlways
+          );
+        if (position != null) {
+          Logger.d("[Foreground location] Location: ${position.latitude} ${position.longitude}. Accuracy: ${position.accuracy}. (${position.timestamp})");
+          String url = "$httpWebHost/api/webhook/$webhookId";
+          Map data = {
+            "type": "update_location",
+            "data": {
+              "gps": [position.latitude, position.longitude],
+              "gps_accuracy": position.accuracy,
+              "battery": batteryLevel ?? 100
+            }
+          };
+          Logger.d("[Foreground location] Sending data home...");
+          var response = await http.post(
            url,
-            headers: headers,
+            headers: {"Content-Type": "application/json"},
            body: json.encode(data)
-        );
-        Logger.d("[Location] ...done.");
+          );
+          Logger.d("[Foreground location] Got HTTP ${response.statusCode}");
+        } else {
+          Logger.d("[Foreground location] No location. Aborting.");
+        }
    }
  }

@ -120,13 +149,15 @@ 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";
@ -138,36 +169,28 @@ 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...");
-          Geolocator().getCurrentPosition(desiredAccuracy: LocationAccuracy.medium).then((location) {
-            //print("[Background $backgroundTask] Got location: ${location.latitude} ${location.longitude}");
+          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}");
              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,
                  body: json.encode(data)
              );
+            } else {
+              throw "Can't get device location. Location is null";
            }
          }).catchError((e) {
-            //print("[Background $backgroundTask] Error getting current location: ${e.toString()}. Trying last known...");
-            Geolocator().getLastKnownPosition(desiredAccuracy: LocationAccuracy.medium).then((location){
-              //print("[Background $backgroundTask] Got last known location: ${location.latitude} ${location.longitude}");
-              if (location != null) {
-                data["data"]["gps"] = [location.latitude, location.longitude];
-                data["data"]["gps_accuracy"] = location.accuracy;
-                //print("[Background $backgroundTask] Sending data home...");
-                http.post(
-                  url,
-                  headers: headers,
-                  body: json.encode(data)
-                );
-              }
-            });
+            sentryBackgroundClient.captureException(
+              exception: "${e.toString()}"
+            );
+            print("[Background $backgroundTask] Error getting current location: ${e.toString()}");
          });
        });
    }
--- a/lib/managers/mobile_app_integration_manager.class.dart
+++ b/lib/managers/mobile_app_integration_manager.class.dart
@ -45,7 +45,7 @@ class MobileAppIntegrationManager {
            positiveText: "Restart now",
            negativeText: "Later",
            onPositive: () {
-              ConnectionManager().callService(domain: "homeassistant", service: "restart", entityId: null);
+              ConnectionManager().callService(domain: "homeassistant", service: "restart");
            },
          ));
        });
@ -81,7 +81,7 @@ class MobileAppIntegrationManager {
        }
        completer.complete();
      }).catchError((e) {
-        if (e['code'] != null && e['code'] == 410) {
+        if (e is http.Response && e.statusCode == 410) {
          Logger.e("MobileApp integration was removed");
          _askToRegisterApp();
        } else {
--- a/lib/pages/entity.page.dart
+++ b/lib/pages/entity.page.dart
@ -50,8 +50,6 @@ class _EntityViewPageState extends State<EntityViewPage> {
        leading: IconButton(icon: Icon(Icons.arrow_back), onPressed: (){
          Navigator.pop(context);
        }),
-        // Here we take the value from the MyHomePage object that was created by
-        // the App.build method, and use it to set our appbar title.
        title: new Text("${entity.displayName}"),
      ),
      body: body,
--- a/lib/pages/integration_settings.page.dart
+++ b/lib/pages/integration_settings.page.dart
@ -29,6 +29,9 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
      setState(() {
        _locationTrackingEnabled = prefs.getBool("location-enabled") ?? false;
        _locationInterval = prefs.getInt("location-interval") ?? LocationManager().defaultUpdateIntervalMinutes;
+        if (_locationInterval % 5 != 0) {
+          _locationInterval = 5 * (_locationInterval ~/ 5);
+        }
      });
    });
  }
@ -36,15 +39,15 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
  void incLocationInterval() {
    if (_locationInterval < 720) {
      setState(() {
-        _locationInterval = _locationInterval + 1;
+        _locationInterval = _locationInterval + 5;
      });
    }
  }

  void decLocationInterval() {
-    if (_locationInterval > 1) {
+    if (_locationInterval > 5) {
      setState(() {
-        _locationInterval = _locationInterval - 1;
+        _locationInterval = _locationInterval - 5;
      });
    }
  }
@ -56,7 +59,7 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
      positiveText: "Sure. Make it so",
      negativeText: "What?? No!",
      onPositive: () {
-        ConnectionManager().callService(domain: "homeassistant", service: "restart", entityId: null);
+        ConnectionManager().callService(domain: "homeassistant", service: "restart");
      },
    ));
  }
@ -68,7 +71,7 @@ class _IntegrationSettingsPageState extends State<IntegrationSettingsPage> {
      positiveText: "Sure. Make it so",
      negativeText: "What?? No!",
      onPositive: () {
-        ConnectionManager().callService(domain: "homeassistant", service: "stop", entityId: null);
+        ConnectionManager().callService(domain: "homeassistant", service: "stop");
      },
    ));
  }
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@ -26,16 +26,20 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
  bool _showLoginButton = false;
  bool _preventAppRefresh = false;
  String _savedSharedText;
-  String _entityToShow;
+  Entity _entityToShow;

  @override
  void initState() {
+    super.initState();
    final Stream purchaseUpdates =
        InAppPurchaseConnection.instance.purchaseUpdatedStream;
    _subscription = purchaseUpdates.listen((purchases) {
      _handlePurchaseUpdates(purchases);
    });
-    super.initState();
+    workManager.Workmanager.initialize(
+      updateDeviceLocationIsolate,
+      isInDebugMode: false
+    );
    enableShareReceiving();
    WidgetsBinding.instance.addObserver(this);

@ -122,7 +126,6 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
    _showInfoBottomBar(progress: true,);
    ConnectionManager().init(loadSettings: false, forceReconnect: false).then((_){
      _fetchData();
-      //StartupUserMessagesManager().checkMessagesToShow();
    }, onError: (e) {
      _setErrorState(e);
    });
@ -142,6 +145,9 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
        _viewsTabController = TabController(vsync: this, length: currentViewCount);
        _previousViewCount = currentViewCount;
      }
+      if (_entityToShow != null) {
+        _entityToShow = HomeAssistant().entities.get(_entityToShow.entityId);
+      }
    }).catchError((e) {
      if (e is HAError) {
        _setErrorState(e);
@ -218,9 +224,8 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
    }
    if (_serviceCallSubscription == null) {
      _serviceCallSubscription =
-          eventBus.on<ServiceCallEvent>().listen((event) {
-            _callService(event.domain, event.service, event.entityId,
-                event.additionalParams);
+          eventBus.on<NotifyServiceCallEvent>().listen((event) {
+            _notifyServiceCalled(event.domain, event.service, event.entityId);
          });
    }

@ -318,27 +323,28 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
    );
  }

-  //TODO remove this shit.... maybe
-  void _callService(String domain, String service, String entityId, Map additionalParams) {
+  void _notifyServiceCalled(String domain, String service, String entityId) {
    _showInfoBottomBar(
        message: "Calling $domain.$service",
-        duration: Duration(seconds: 3)
+        duration: Duration(seconds: 4)
    );
-    ConnectionManager().callService(domain: domain, service: service, entityId: entityId, additionalServiceData: additionalParams).catchError((e) => _setErrorState(e));
  }

  void _showEntityPage(String entityId) {
    setState(() {
-      _entityToShow = entityId;
+      _entityToShow = HomeAssistant().entities?.get(entityId);
+      if (_entityToShow != null) {
+        _mainScrollController?.jumpTo(0);
+      }
    });
-    if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
+    /*if (_entityToShow!= null && MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
      Navigator.push(
          context,
          MaterialPageRoute(
            builder: (context) => EntityViewPage(entityId: entityId),
          )
      );
-    }
+    }*/
  }

  void _showPage(String path, bool goBackFirst) {
@ -368,12 +374,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
    menuItems.add(
        UserAccountsDrawerHeader(
          accountName: Text(HomeAssistant().userName),
-          accountEmail: Text(ConnectionManager().displayHostname ?? "Not configured"),
-          onDetailsPressed: () {
-            Launcher.launchURLInCustomTab(
-              url: "${ConnectionManager().httpWebHost}/profile?external_auth=1"
-            );
-          },
+          accountEmail: Text(HomeAssistant().locationName ?? ""),
          currentAccountPicture: CircleAvatar(
            child: Text(
              HomeAssistant().userAvatarText,
@ -636,6 +637,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
  }

  final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
+  final ScrollController _mainScrollController = ScrollController();

  Widget _buildScaffoldBody(bool empty) {
    List<PopupMenuItem<String>> serviceMenuItems = [];
@ -730,7 +732,6 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
      }
    } else {
      if (_entityToShow != null && MediaQuery.of(context).size.width >= Sizes.tabletMinWidth) {
-        Entity entity = HomeAssistant().entities.get(_entityToShow);
        mainScrollBody = Flex(
          direction: Axis.horizontal,
          children: <Widget>[
@ -743,12 +744,13 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
            ),
            ConstrainedBox(
              constraints: BoxConstraints.tightFor(width: Sizes.entityPageMaxWidth),
-              child: EntityPageLayout(entity: entity, showClose: true,),
+              child: EntityPageLayout(entity: _entityToShow, showClose: true,),
            )
          ],
        );
+      } else if (_entityToShow != null) {
+        mainScrollBody = EntityPageLayout(entity: _entityToShow, showClose: true,);
      } else {
-        _entityToShow = null;
        mainScrollBody = HomeAssistant().buildViews(context, _viewsTabController);
      }
    }
@ -804,7 +806,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
                  _scaffoldKey.currentState.openDrawer();
                },
              ),
-              bottom: empty ? null : TabBar(
+              bottom: (empty || _entityToShow != null) ? null : TabBar(
                controller: _viewsTabController,
                tabs: buildUIViewTabs(),
                isScrollable: true,
@ -813,7 +815,8 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse

          ];
        },
-        body: mainScrollBody
+        body: mainScrollBody,
+        controller: _mainScrollController,
    );
  }

@ -879,12 +882,22 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
          body: _buildScaffoldBody(true)
      );
    } else {
-      return Scaffold(
-        key: _scaffoldKey,
-        drawer: _buildAppDrawer(),
-        primary: false,
-        bottomNavigationBar: bottomBar,
-        body: _buildScaffoldBody(false)
+      return WillPopScope(
+        child: Scaffold(
+          key: _scaffoldKey,
+          drawer: _buildAppDrawer(),
+          primary: false,
+          bottomNavigationBar: bottomBar,
+          body: _buildScaffoldBody(false)
+        ),
+        onWillPop: () {
+          if (_entityToShow != null) {
+            eventBus.fire(ShowEntityPageEvent());
+            return Future.value(false);
+          } else {
+            return Future.value(true);
+          }
+        },
      );
    }
  }
--- a/lib/pages/play_media.page.dart
+++ b/lib/pages/play_media.page.dart
@ -90,16 +90,20 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
      Navigator.pop(context);
      ConnectionManager().callService(
          domain: serviceDomain,
-          entityId: entity.entityId,
          service: "play_media",
-          additionalServiceData: {
-            "media_content_id": _mediaUrl,
-            "media_content_type": _contentType
-          }
+          entityId: entity.entityId,
+          data: {
+              "media_content_id": _mediaUrl,
+              "media_content_type": _contentType
+            }
      );
      HomeAssistant().sendToPlayerId = entity.entityId;
      if (HomeAssistant().sendFromPlayerId != null && HomeAssistant().sendFromPlayerId != HomeAssistant().sendToPlayerId) {
-        eventBus.fire(ServiceCallEvent(HomeAssistant().sendFromPlayerId.split(".")[0], "turn_off", HomeAssistant().sendFromPlayerId, null));
+        ConnectionManager().callService(
+          domain: HomeAssistant().sendFromPlayerId.split(".")[0],
+          service: "turn_off",
+          entityId: HomeAssistant().sendFromPlayerId
+        );
        HomeAssistant().sendFromPlayerId = null;
      }
      eventBus.fire(ShowEntityPageEvent(entity: entity));
@ -241,5 +245,5 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
    _refreshDataSubscription?.cancel();
    super.dispose();
  }
-  
+
 }
--- a/lib/pages/settings.page.dart
+++ b/lib/pages/settings.page.dart
@ -75,10 +75,16 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {

  _saveSettings() async {
    _newHassioDomain = _newHassioDomain.trim();
-    if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
+    if (_newHassioDomain.startsWith("http") && _newHassioDomain.indexOf("//") > 0) {
+      _newHassioDomain.startsWith("https") ? _newSocketProtocol = "wss" : _newSocketProtocol = "ws";
      _newHassioDomain = _newHassioDomain.split("//")[1];
    }
    _newHassioDomain = _newHassioDomain.split("/")[0];
+    if (_newHassioDomain.contains(":")) {
+      List<String> domainAndPort = _newHassioDomain.split(":");
+      _newHassioDomain = domainAndPort[0];
+      _newHassioPort = domainAndPort[1];
+    }
    SharedPreferences prefs = await SharedPreferences.getInstance();
    final storage = new FlutterSecureStorage();
    if (_newLongLivedToken.isNotEmpty) {
--- a/lib/pages/whats_new.page.dart
+++ b/lib/pages/whats_new.page.dart
@ -24,7 +24,7 @@ class _WhatsNewPageState extends State<WhatsNewPage> {
      error = "";
    });
    http.Response response;
-    response = await http.get("http://ha-client.homemade.systems/service/whats_new_$appVersionNumber.md");
+    response = await http.get("http://ha-client.homemade.systems/service/whats_new_0.7.0.md");
    if (response.statusCode == 200) {
      setState(() {
        data = response.body;
--- a/lib/plugins/dynamic_multi_column_layout.dart
+++ b/lib/plugins/dynamic_multi_column_layout.dart
@ -86,7 +86,11 @@ class RenderCustomLayoutBox extends RenderBox
    int columnsCount;
    List<double> columnXPositions = [];
    List<double> columnYPositions = [];
-    columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    if (constraints.maxWidth < this.minColumnWidth) {
+        columnsCount = 1;
+    } else {
+        columnsCount = (constraints.maxWidth ~/ this.minColumnWidth);
+    }
    if (childCount == 0 || columnsCount == 0) {
      size = constraints.biggest;
      assert(size.isFinite);
--- a/lib/types/event_bus_events.dart
+++ b/lib/types/event_bus_events.dart
@ -33,13 +33,12 @@ class StartAuthEvent {
  StartAuthEvent(this.oauthUrl, this.showButton);
 }

-class ServiceCallEvent {
+class NotifyServiceCallEvent {
  String domain;
  String service;
  String entityId;
-  Map<String, dynamic> additionalParams;

-  ServiceCallEvent(this.domain, this.service, this.entityId, this.additionalParams);
+  NotifyServiceCallEvent(this.domain, this.service, this.entityId);
 }

 class ShowPopupDialogEvent {
--- a/lib/utils/logger.dart
+++ b/lib/utils/logger.dart
@ -23,6 +23,10 @@ class Logger {
    return inDebugMode;
  }

+  static void p(data) {
+    print(data);
+  }
+
  static void e(String message) {
    _writeToLog("Error", message);
  }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,7 +1,8 @@
 name: hass_client
 description: Home Assistant Android Client

-version: 0.7.0+706
+version: 0.7.6+760
+

 environment:
  sdk: ">=2.0.0-dev.68.0 <3.0.0"
@ -17,7 +18,7 @@ dependencies:
  url_launcher: any
  date_format: any
  charts_flutter: ^0.8.1
-  flutter_markdown: any
+  flutter_markdown: 0.3.0
  in_app_purchase: ^0.2.1+4
  flutter_custom_tabs: ^0.6.0
  firebase_messaging: ^5.1.6
@ -25,9 +26,10 @@ dependencies:
  flutter_secure_storage: ^3.3.1+1
  device_info: ^0.4.0+3
  flutter_local_notifications: ^0.8.4
-  geolocator: ^5.1.4+2
-  workmanager: ^0.1.3
+  geolocator: ^5.1.5
+  workmanager: ^0.1.5
  battery: ^0.3.1+1
+  sentry: ^2.3.1
  share:
    git:
      url: https://github.com/d-silveira/flutter-share.git
@ -53,4 +55,4 @@ flutter:
  fonts:
    - family: "Material Design Icons"
      fonts:
-        - asset: fonts/materialdesignicons-webfont-4.5.95.ttf
+        - asset: fonts/materialdesignicons-webfont-4.5.95.ttf
Author	SHA1	Message	Date
Yegor Vialov	a241cc1d61	Resolves #494	2019-11-29 13:40:51 +00:00
Yegor Vialov	8b4df98cb9	0.7.6	2019-11-29 13:02:22 +00:00
Yegor Vialov	7d30c2f9d5	Wrap empty navigate action	2019-11-29 12:45:59 +00:00
Yegor Vialov	44acabadfe	Fix location tracking backfroud task id	2019-11-29 11:27:59 +00:00
Yegor Vialov	6f3a2bb78d	Fix timeout handling on socket message send	2019-11-29 11:24:29 +00:00
Yegor Vialov	dd5f8b155d	Handle some socket exceptions	2019-11-29 11:21:45 +00:00
Yegor Vialov	cd81fc72fd	Fix connection timeout handling	2019-11-29 10:58:24 +00:00
Yegor Vialov	890da650dc	Resolves #508 show_name for enriry button card	2019-11-29 10:12:41 +00:00
Yegor Vialov	9897b6a44b	Fix show_empty for entity-filter	2019-11-29 10:05:09 +00:00
Yegor Vialov	7969f54d3b	Fix MissedPluginException for workmanager	2019-11-28 19:54:22 +00:00
Yegor Vialov	7c18454de3	Fix issue with handling service call exceptions	2019-11-28 19:14:50 +00:00
Yegor Vialov	dcf5efddd1	Parse port and protocol from HA url	2019-11-28 18:57:41 +00:00
Yegor Vialov	a6541134e0	Fix compliting alrady completed future	2019-11-28 18:33:27 +00:00
Yegor Vialov	90504047b4	Resolves #492 Infinity media player progress error	2019-11-28 17:42:48 +00:00
Yegor Vialov	ca1eec6602	Update bug_report.md	2019-11-27 18:44:45 +02:00
Yegor Vialov	edc01d14b7	Resolves #511	2019-11-27 17:21:23 +02:00
Yegor Vialov	6cb5463b13	minor background reporting fix	2019-11-27 14:50:53 +00:00
Yegor Vialov	63a789ebfb	0.7.5 name fix	2019-11-27 12:48:03 +00:00
Yegor Vialov	a0994e9a60	0.7.5	2019-11-27 12:42:09 +00:00
Yegor Vialov	8d1b728194	Background location tracking crash reporting	2019-11-27 12:41:38 +00:00
Yegor Vialov	1a9fec8b98	Senty reporting. Fix background location tracking crash	2019-11-27 12:26:55 +00:00
Yegor Vialov	e634253282	0.7.4	2019-11-26 21:13:59 +00:00
Yegor Vialov	64b23ec7cc	Revert flutter_markdown to 0.3.0	2019-11-26 21:13:07 +00:00
Yegor Vialov	afe207a878	Removes foreground location and Resolves #510	2019-11-26 20:56:24 +00:00
Yegor Vialov	4bac0c092f	Removes foreground location and Resolves #510	2019-11-26 20:54:36 +00:00
Yegor Vialov	74c8ae35a1	Remove network security config	2019-11-26 20:48:08 +00:00
Yegor Vialov	7856637456	Fix app version display	2019-11-26 16:50:19 +00:00
Yegor Vialov	965f80a6ca	0.7.3	2019-11-14 12:58:56 +02:00
Yegor Vialov	198c2ba49a	build 730	2019-11-14 12:58:32 +02:00
Yegor Vialov	4b9ec5ca6e	Foreground location updates	2019-11-10 21:53:28 +00:00
Yegor Vialov	5792652619	Experimental location tracking for every 10 or 5 minutes	2019-11-10 14:41:29 +00:00
Yegor Vialov	2c900333a5	WIP #344 Add network security config to allow user certificates	2019-11-10 13:53:25 +00:00
Yegor Vialov	1f782d7cd3	Resolves #498 Handle bool state	2019-11-10 13:48:05 +00:00
Yegor Vialov	89cc1833de	Resolves #493 Send media_player calls even if it if unavailable	2019-11-08 20:50:31 +00:00
Yegor Vialov	1262d8c9aa	Resolves #484 Fix entity-filter cards	2019-11-08 20:41:51 +00:00
Yegor Vialov	85b0c4f814	Resolves #419 Fallback to states if no lovelace config found	2019-11-08 20:14:34 +00:00
Yegor Vialov	551a8dfa31	Fixx service calls	2019-11-08 19:37:41 +00:00
Yegor Vialov	139533d2ca	0.7.2	2019-11-01 14:00:13 +00:00
Yegor Vialov	889682f771	Resolves #491 Lovelace badges parse issue	2019-11-01 13:54:35 +00:00
Yegor Vialov	f16c98057f	Location fixes	2019-11-01 13:44:51 +00:00
Yegor Vialov	26ec807c25	Resolves #490 Prevent fused coarse location	2019-10-30 16:54:25 +00:00
Yegor Vialov	45af6cbe3c	Fix play_media call	2019-10-30 15:04:23 +00:00
Yegor Vialov	5dd9cde12d	Entity page fixes	2019-10-30 14:25:30 +00:00
Yegor Vialov	472fb1d367	Merge pull request #489 from estevez-dev/hotfix/0.7.1 Hotfix/0.7.1	2019-10-29 19:47:33 +02:00
Yegor Vialov	8b372fbc0b	Merge branch 'master' into hotfix/0.7.1	2019-10-29 19:47:24 +02:00
Yegor Vialov	40d72eb6e1	0.7.1	2019-10-29 17:46:16 +00:00
Yegor Vialov	ced008a7c1	Resolves #486 Fix for very small screens	2019-10-29 17:44:18 +00:00
Yegor Vialov	d1f652282a	Merge pull request #488 from estevez-dev/pre-release/0.7.1 Pre release/0.7.1	2019-10-29 19:35:10 +02:00
Yegor Vialov	f656528d5b	711	2019-10-28 20:42:05 +00:00
Yegor Vialov	bcdb2a648c	Fix entity page linking after app resumed	2019-10-28 20:40:30 +00:00
Yegor Vialov	8a78745aa7	State change event log	2019-10-28 20:34:43 +00:00
Yegor Vialov	2a3eaabbe4	Remove some logs	2019-10-28 20:32:23 +00:00
Yegor Vialov	bcd175fbfb	Fix service calls	2019-10-28 20:31:45 +00:00
Yegor Vialov	f9f013636d	710	2019-10-28 18:02:03 +00:00
Yegor Vialov	b34cc97080	Show entity page on main page	2019-10-28 17:59:47 +00:00
Yegor Vialov	327f623ef7	Remove HA url from main manu	2019-10-28 16:39:47 +00:00
Yegor Vialov	4d0877e5ae	Remove Profile link	2019-10-28 16:36:20 +00:00
Yegor Vialov	0eac217399	Set minimum location update intervhals to 15 minute	2019-10-28 16:28:01 +00:00