Remove test exception

lib/cards/card.class.dart

@@ -12,65 +12,77 @@ class CardData {
   EntityWrapper get entity => entities.isNotEmpty ? entities[0] : null;
 
   factory CardData.parse(Map<String, dynamic> rawData) {
-    switch (rawData['type']) {
-      case CardType.ENTITIES:
-        return EntitiesCardData(rawData);
-        break;
-      case CardType.ALARM_PANEL:
-        return AlarmPanelCardData(rawData);
-        break;
-      case CardType.BUTTON:
-        return ButtonCardData(rawData);
-        break;
-      case CardType.ENTITY_BUTTON:
-        return ButtonCardData(rawData);
-        break;
-      case CardType.CONDITIONAL:
-        return CardData.parse(rawData['card']);
-        break;
-      case CardType.ENTITY_FILTER:
-        Map<String, dynamic> cardData = Map.from(rawData);
-        cardData.remove('type');
-        if (rawData.containsKey('card')) {
-          cardData.addAll(rawData['card']);
-        }
-        cardData['type'] ??= CardType.ENTITIES;
-        return CardData.parse(cardData);
-        break;
-      case CardType.GAUGE:
-        return GaugeCardData(rawData);
-        break;
-      case CardType.GLANCE:
-        return GlanceCardData(rawData);
-        break;
-      case CardType.HORIZONTAL_STACK:
-        return HorizontalStackCardData(rawData);
-        break;
-      case CardType.VERTICAL_STACK:
-        return VerticalStackCardData(rawData);
-        break;
-      case CardType.MARKDOWN:
-        return MarkdownCardData(rawData);
-        break;
-      case CardType.MEDIA_CONTROL:
-        return MediaControlCardData(rawData);
-        break;
-      default:
-        if (rawData.containsKey('entities')) {
+    try {
+      switch (rawData['type']) {
+        case CardType.ENTITIES:
           return EntitiesCardData(rawData);
-        } else if (rawData.containsKey('entity')) {
-          rawData['entities'] = [rawData['entity']];
-          return EntitiesCardData(rawData);
-        }
-        return CardData(rawData);
+          break;
+        case CardType.ALARM_PANEL:
+          return AlarmPanelCardData(rawData);
+          break;
+        case CardType.BUTTON:
+          return ButtonCardData(rawData);
+          break;
+        case CardType.ENTITY_BUTTON:
+          return ButtonCardData(rawData);
+          break;
+        case CardType.CONDITIONAL:
+          return CardData.parse(rawData['card']);
+          break;
+        case CardType.ENTITY_FILTER:
+          Map<String, dynamic> cardData = Map.from(rawData);
+          cardData.remove('type');
+          if (rawData.containsKey('card')) {
+            cardData.addAll(rawData['card']);
+          }
+          cardData['type'] ??= CardType.ENTITIES;
+          return CardData.parse(cardData);
+          break;
+        case CardType.GAUGE:
+          return GaugeCardData(rawData);
+          break;
+        case CardType.GLANCE:
+          return GlanceCardData(rawData);
+          break;
+        case CardType.HORIZONTAL_STACK:
+          return HorizontalStackCardData(rawData);
+          break;
+        case CardType.VERTICAL_STACK:
+          return VerticalStackCardData(rawData);
+          break;
+        case CardType.MARKDOWN:
+          return MarkdownCardData(rawData);
+          break;
+        case CardType.MEDIA_CONTROL:
+          return MediaControlCardData(rawData);
+          break;
+        default:
+          if (rawData.containsKey('entities')) {
+            return EntitiesCardData(rawData);
+          } else if (rawData.containsKey('entity')) {
+            rawData['entities'] = [rawData['entity']];
+            return EntitiesCardData(rawData);
+          }
+          return CardData(rawData);
+      }
+    } catch (error) {
+      Logger.e('Error parsing card: $error');
+      return ErrorCardData(rawData);
     }
   }
 
   CardData(Map<String, dynamic> rawData) {
-    type = rawData['type'] ?? CardType.ENTITIES;
-    conditions = rawData['conditions'] ?? [];
-    showEmpty = rawData['show_empty'] ?? true;
-    stateFilter = rawData['state_filter'] ?? [];
+    if (rawData != null) {
+      type = rawData['type'] ?? CardType.ENTITIES;
+      conditions = rawData['conditions'] ?? [];
+      showEmpty = rawData['show_empty'] ?? true;
+      stateFilter = rawData['state_filter'] ?? [];
+    } else {
+      type = CardType.UNKNOWN;
+      conditions = [];
+      showEmpty = true;
+      stateFilter = [];
+    }
   }
 
   Widget buildCardWidget() {
@@ -508,3 +520,18 @@ class MediaControlCardData extends CardData {
   }
 
 }
+
+class ErrorCardData extends CardData {
+
+  String cardConfig;
+
+  @override
+  Widget buildCardWidget() {
+    return ErrorCard(card: this);
+  }
+
+  ErrorCardData(Map<String, dynamic> rawData) : super(rawData) {
+    cardConfig = '$rawData';
+  }
+
+}

lib/cards/error_card.dart

@@ -0,0 +1,38 @@
+part of '../main.dart';
+
+class ErrorCard extends StatelessWidget {
+  final ErrorCardData card;
+
+  const ErrorCard({Key key, this.card}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return CardWrapper(
+      child: Padding(
+        padding: EdgeInsets.fromLTRB(Sizes.leftWidgetPadding, Sizes.rowPadding, Sizes.rightWidgetPadding, Sizes.rowPadding),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: <Widget>[
+            Text(
+              'There was an error rendering card: ${card.type}. Please copy card config to clipboard and report this issue. Thanks!',
+              textAlign: TextAlign.center,
+            ),
+            RaisedButton(
+              onPressed: () {
+                Clipboard.setData(new ClipboardData(text: card.cardConfig));
+              },
+              child: Text('Copy card config'),
+            ),
+            RaisedButton(
+              onPressed: () {
+                Launcher.launchURL("https://github.com/estevez-dev/ha_client/issues/new?assignees=&labels=&template=bug_report.md&title=");
+              },
+              child: Text('Report issue'),
+            )
+          ],
+        ),
+      )
+    );
+  }  
+}

lib/const.dart

@@ -119,6 +119,7 @@ class CardType {
   static const MARKDOWN = "markdown";
   static const LIGHT = "light";
   static const ENTITY_FILTER = "entity-filter";
+  static const UNKNOWN = "unknown";
 }
 
 class Sizes {

lib/main.dart

@@ -142,6 +142,7 @@ part 'cards/horizontal_srack_card.dart';
 part 'cards/markdown_card.dart';
 part 'cards/media_control_card.dart';
 part 'cards/unsupported_card.dart';
+part 'cards/error_card.dart';
 part 'cards/vertical_stack_card.dart';
 part 'cards/glance_card.dart';
 part 'pages/play_media.page.dart';
@@ -155,7 +156,7 @@ EventBus eventBus = new EventBus();
 final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
 FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin();
 const String appName = "HA Client";
-const appVersionNumber = "0.8.5";
+const appVersionNumber = "0.8.6";
 const appVersionAdd = "";
 const appVersion = "$appVersionNumber$appVersionAdd";
 

pubspec.yaml

@@ -1,7 +1,7 @@
 name: hass_client
 description: Home Assistant Android Client
 
-version: 0.8.5+896
+version: 0.8.6+897
 
 
 environment: