From 90105c3b09d61eebbbecb437f8383b022106cd9b Mon Sep 17 00:00:00 2001
From: Yegor Vialov <vyalov.egor@gmail.com>
Date: Wed, 6 May 2020 17:51:06 +0000
Subject: [PATCH] Cache reading issues fix

---
 lib/home_assistant.class.dart                 | 38 ++++++++++++-------
 lib/plugins/history_chart/entity_history.dart |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart
index b9d3dfb..3ba4a9c 100644
--- a/lib/home_assistant.class.dart
+++ b/lib/home_assistant.class.dart
@@ -140,9 +140,9 @@ class HomeAssistant {
 
   Future _getConfig(SharedPreferences sharedPrefs) async {
     _instanceConfig?.clear();
-    if (sharedPrefs != null) {
+    if (sharedPrefs != null && sharedPrefs.containsKey('cached_config')) {
       try {
-        var data = json.decode(sharedPrefs.getString('cached_config') ?? '{}');
+        var data = json.decode(sharedPrefs.getString('cached_config'));
         _parseConfig(data);
       } catch (e, stacktrace) {
        Logger.e('Error gettong config from cache: $e', stacktrace: stacktrace);
@@ -160,9 +160,9 @@ class HomeAssistant {
   }
 
   Future _getStates(SharedPreferences sharedPrefs) async {
-    if (sharedPrefs != null) {
+    if (sharedPrefs != null && sharedPrefs.containsKey('cached_states')) {
       try {
-        var data = json.decode(sharedPrefs.getString('cached_states') ?? '[]');
+        var data = json.decode(sharedPrefs.getString('cached_states'));
         _parseStates(data);
       } catch (e, stacktrace) {
         Logger.e('Error getting cached states: $e', stacktrace: stacktrace);
@@ -171,7 +171,7 @@ class HomeAssistant {
       await ConnectionManager().sendSocketMessage(type: "get_states").then(
               (data) => _parseStates(data)
       ).catchError((e) {
-       Logger.e('get_states error: $e');
+        Logger.e('get_states error: $e');
         throw HACException("Error getting states: $e");
       });
     }
@@ -183,9 +183,9 @@ class HomeAssistant {
   }
 
   Future _getLovelace(SharedPreferences sharedPrefs) {
-    if (sharedPrefs != null) {
+    if (sharedPrefs != null && sharedPrefs.containsKey('cached_lovelace')) {
       try {
-        var data = json.decode(sharedPrefs.getString('cached_lovelace') ?? '{}');
+        var data = json.decode(sharedPrefs.getString('cached_lovelace'));
         _rawLovelaceData = data;
       } catch (e) {
         autoUi = true;
@@ -221,9 +221,9 @@ class HomeAssistant {
 
   Future _getServices(SharedPreferences prefs) async {
     services?.clear();	
-    if (prefs != null) {
+    if (prefs != null && prefs.containsKey('cached_services')) {
       try {
-        var data = json.decode(prefs.getString('cached_services') ?? '{}');
+        var data = json.decode(prefs.getString('cached_services'));
         _parseServices(data);
       } catch (e, stacktrace) {
        Logger.e(e, stacktrace: stacktrace);  
@@ -240,9 +240,19 @@ class HomeAssistant {
 
   Future _getUserInfo(SharedPreferences sharedPrefs) async {
     _userName = null;
-    await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _parseUserInfo(data)).catchError((e) {
-      Logger.e('auth/current_user error: $e');
-    });
+    if (sharedPrefs != null && sharedPrefs.containsKey('cached_user')) {
+      try {
+        var data = json.decode(sharedPrefs.getString('cached_user'));
+        _parseUserInfo(data);
+      } catch (e, stacktrace) {
+        Logger.e('Error getting cached user info: $e', stacktrace: stacktrace);
+      }
+      return Future.value();
+    } else {
+      await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _parseUserInfo(data)).catchError((e) {
+        Logger.e('auth/current_user error: $e');
+      });
+    }
   }
 
   void _parseUserInfo(data) {
@@ -251,9 +261,9 @@ class HomeAssistant {
   }
 
   Future _getPanels(SharedPreferences sharedPrefs) async {
-    if (sharedPrefs != null) {
+    if (sharedPrefs != null && sharedPrefs.containsKey('cached_panels')) {
       try {
-        var data = json.decode(sharedPrefs.getString('cached_panels') ?? '{}');
+        var data = json.decode(sharedPrefs.getString('cached_panels'));
         _parsePanels(data);
       } catch (e, stacktrace) {
         Logger.e(e, stacktrace: stacktrace);
diff --git a/lib/plugins/history_chart/entity_history.dart b/lib/plugins/history_chart/entity_history.dart
index 14dec4c..c8ce355 100644
--- a/lib/plugins/history_chart/entity_history.dart
+++ b/lib/plugins/history_chart/entity_history.dart
@@ -54,7 +54,7 @@ class _EntityHistoryWidgetState extends State<EntityHistoryWidget> {
           });
         }
       }).catchError((e) {
-        Logger.e("Error loading $entityId history: $e");
+        Logger.e("Error loading $entityId history: $e", skipCrashlytics: true);
         if (!_disposed) {
           setState(() {
             _history = [];