yehor/ha_client
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap empty navigate action

Browse Source
This commit is contained in:
Yegor Vialov 2019-11-29 12:45:59 +00:00
parent 44acabadfe
commit 7d30c2f9d5
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/entities/entity_wrapper.class.dart
View File

@ -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 {
@ -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 {

28
lib/managers/connection_manager.class.dart
View File

@ -98,20 +98,22 @@ class ConnectionManager {
void _doConnect({Completer completer, bool forceReconnect}) {
if (forceReconnect || !isConnected) {
_connect().timeout(connectTimeout).then((_) {
completer?.complete();
}).catchError((e) {
_disconnect().then((_) {
if (e is TimeoutException) {
if (connecting != null && !connecting.isCompleted) {
connecting.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()}"));
}
completer?.completeError(HAError("Connection timeout"));
} else if (e is HAError) {
completer?.completeError(e);
} else {
completer?.completeError(HAError("${e.toString()}"));
}
});
});
});
} else {