diff --git a/lib/home_assistant.class.dart b/lib/home_assistant.class.dart index beaeab4..de97595 100644 --- a/lib/home_assistant.class.dart +++ b/lib/home_assistant.class.dart @@ -13,6 +13,7 @@ class HomeAssistant { Map _instanceConfig = {}; Map services; String _userName; + bool childMode; HSVColor savedColor; int savedPlayerPosition; String sendToPlayerId; @@ -68,7 +69,7 @@ class HomeAssistant { )); Future.wait(futures).then((_) { if (isMobileAppEnabled) { - _createUI(); + if (!childMode) _createUI(); _fetchCompleter.complete(); MobileAppIntegrationManager.checkAppRegistration(); } else { @@ -113,8 +114,11 @@ class HomeAssistant { Future _getUserInfo() async { _userName = null; - await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) => _userName = data["name"]).catchError((e) { - Logger.w("Can't get user info: ${e}"); + await ConnectionManager().sendSocketMessage(type: "auth/current_user").then((data) { + _userName = data["name"]; + childMode = _userName.startsWith("[child]"); + }).catchError((e) { + Logger.w("Can't get user info: $e"); }); } @@ -124,7 +128,7 @@ class HomeAssistant { Logger.d("Media extractor: ${data["media_extractor"]}"); services = data; }).catchError((e) { - Logger.w("Can't get services: ${e}"); + Logger.w("Can't get services: $e"); }); } @@ -369,7 +373,7 @@ class SendMessageQueue { void add(String message) { _queue.add(HAMessage(_messageTimeout, message)); } - + List getActualMessages() { _queue.removeWhere((item) => item.isExpired()); List result = []; @@ -379,22 +383,22 @@ class SendMessageQueue { this.clear(); return result; } - + void clear() { _queue.clear(); } - + } class HAMessage { DateTime _timeStamp; int _messageTimeout; String message; - + HAMessage(this._messageTimeout, this.message) { _timeStamp = DateTime.now(); } - + bool isExpired() { return DateTime.now().difference(_timeStamp).inSeconds > _messageTimeout; } diff --git a/lib/main.dart b/lib/main.dart index 54fca17..4eb2a9b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -142,7 +142,7 @@ final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = new FlutterLocalNotificationsPlugin(); const String appName = "HA Client"; const appVersionNumber = "0.7.0"; -const appVersionAdd = "alpha1"; +const appVersionAdd = ""; const appVersion = "$appVersionNumber-$appVersionAdd"; void main() async { diff --git a/lib/managers/startup_user_messages_manager.class.dart b/lib/managers/startup_user_messages_manager.class.dart index 3037401..8830e84 100644 --- a/lib/managers/startup_user_messages_manager.class.dart +++ b/lib/managers/startup_user_messages_manager.class.dart @@ -14,7 +14,7 @@ class StartupUserMessagesManager { bool _supportAppDevelopmentMessageShown; bool _whatsNewMessageShown; static final _supportAppDevelopmentMessageKey = "user-message-shown-support-development_3"; - static final _whatsNewMessageKey = "user-message-shown-whats-new-705"; + static final _whatsNewMessageKey = "user-message-shown-whats-new-706"; void checkMessagesToShow() async { SharedPreferences prefs = await SharedPreferences.getInstance(); diff --git a/pubspec.yaml b/pubspec.yaml index b65b02c..c564904 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: hass_client description: Home Assistant Android Client -version: 0.7.0+705 +version: 0.7.0+706 environment: sdk: ">=2.0.0-dev.68.0 <3.0.0"