From 40850064460604375b709e66fc0cb09b0ae58780 Mon Sep 17 00:00:00 2001
From: Yegor Vialov <vyalov.egor@gmail.com>
Date: Sun, 7 Oct 2018 09:55:37 +0300
Subject: [PATCH] Fix save settings issue

---
 lib/main.dart          |  4 ++--
 lib/settings.page.dart | 16 ++++++++--------
 lib/utils.class.dart   |  7 +++++++
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 6d58ed3..f37284a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -356,7 +356,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
     );
   }
 
-  _checkShowInfo(BuildContext context) {
+  _checkShowInfo() {
     if (_errorCodeToBeShown > 0) {
       String message = _lastErrorMessage;
       SnackBarAction action;
@@ -465,7 +465,7 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver {
 
   @override
   Widget build(BuildContext context) {
-    _checkShowInfo(context);
+    _checkShowInfo();
     // This method is rerun every time setState is called.
     if (_entities == null) {
       return _buildScaffold(true);
diff --git a/lib/settings.page.dart b/lib/settings.page.dart
index 4e9f1e6..1738bea 100644
--- a/lib/settings.page.dart
+++ b/lib/settings.page.dart
@@ -60,16 +60,16 @@ class _ConnectionSettingsPageState extends State<ConnectionSettingsPage> {
   }
 
   _saveSettings() async {
-    if (_hassioDomain.indexOf("http") == 0 && _hassioDomain.indexOf("//") > 0) {
-      _hassioDomain = _hassioDomain.split("//")[1];
+    if (_newHassioDomain.indexOf("http") == 0 && _newHassioDomain.indexOf("//") > 0) {
+      _newHassioDomain = _newHassioDomain.split("//")[1];
     }
     SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.setString("hassio-domain", _hassioDomain);
-    prefs.setString("hassio-port", _hassioPort);
-    prefs.setString("hassio-password", _hassioPassword);
-    prefs.setString("hassio-protocol", _socketProtocol);
-    prefs.setString("hassio-res-protocol", _socketProtocol == "wss" ? "https" : "http");
-    prefs.setString("hassio-auth-type", _authType);
+    prefs.setString("hassio-domain", _newHassioDomain);
+    prefs.setString("hassio-port", _newHassioPort);
+    prefs.setString("hassio-password", _newHassioPassword);
+    prefs.setString("hassio-protocol", _newSocketProtocol);
+    prefs.setString("hassio-res-protocol", _newSocketProtocol == "wss" ? "https" : "http");
+    prefs.setString("hassio-auth-type", _newAuthType);
   }
 
   @override
diff --git a/lib/utils.class.dart b/lib/utils.class.dart
index 2a2edc5..68156b4 100644
--- a/lib/utils.class.dart
+++ b/lib/utils.class.dart
@@ -77,4 +77,11 @@ class ShowEntityPageEvent {
   Entity entity;
 
   ShowEntityPageEvent(this.entity);
+}
+
+class ShowErrorEvent {
+  String text;
+  int errorCode;
+
+  ShowErrorEvent(this.text, this.errorCode);
 }
\ No newline at end of file