From 67aa7ae17225e30434b95de22a2fc555f8e96d21 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 20 Feb 2021 23:25:01 +0100 Subject: [PATCH] Drop checks for version less than 1.10 as we won't connect to that anyways any more --- libnymea-app/engine.cpp | 5 +--- nymea-app/ui/SettingsPage.qml | 1 - nymea-app/ui/components/ThingContextMenu.qml | 26 +++++++++---------- .../ui/customviews/GenericTypeLogView.qml | 6 ++--- nymea-app/ui/devicepages/DeviceLogPage.qml | 3 +-- nymea-app/ui/devicepages/StateLogPage.qml | 11 +++----- nymea-app/ui/magic/EditRulePage.qml | 4 +-- 7 files changed, 21 insertions(+), 35 deletions(-) diff --git a/libnymea-app/engine.cpp b/libnymea-app/engine.cpp index 235e02bc..771e2cf1 100644 --- a/libnymea-app/engine.cpp +++ b/libnymea-app/engine.cpp @@ -150,13 +150,10 @@ void Engine::onConnectedChanged() void Engine::onDeviceManagerFetchingChanged() { if (!m_thingManager->fetchingData()) { + m_tagsManager->init(); m_ruleManager->init(); m_scriptManager->init(); m_nymeaConfiguration->init(); m_systemController->init(); - - if (m_jsonRpcClient->ensureServerVersion("1.7")) { - m_tagsManager->init(); - } } } diff --git a/nymea-app/ui/SettingsPage.qml b/nymea-app/ui/SettingsPage.qml index f1137d3f..f9a387ff 100644 --- a/nymea-app/ui/SettingsPage.qml +++ b/nymea-app/ui/SettingsPage.qml @@ -106,7 +106,6 @@ Page { Pane { Layout.fillWidth: true Material.elevation: layout.isGrid ? 1 : 0 - visible: engine.jsonRpcClient.ensureServerVersion("1.9") padding: 0 NymeaSwipeDelegate { diff --git a/nymea-app/ui/components/ThingContextMenu.qml b/nymea-app/ui/components/ThingContextMenu.qml index 34cae6ed..cd5ace82 100644 --- a/nymea-app/ui/components/ThingContextMenu.qml +++ b/nymea-app/ui/components/ThingContextMenu.qml @@ -22,21 +22,19 @@ AutoSizeMenu { root.addItem(menuEntryComponent.createObject(root, {text: qsTr("Logs"), iconSource: "../images/logs.svg", functionName: "openThingLogPage"})) } - if (engine.jsonRpcClient.ensureServerVersion("1.6")) { - root.addItem(menuEntryComponent.createObject(root, - { - text: Qt.binding(function() { return favoritesProxy.count === 0 ? qsTr("Mark as favorite") : qsTr("Remove from favorites")}), - iconSource: Qt.binding(function() { return favoritesProxy.count === 0 ? "../images/starred.svg" : "../images/non-starred.svg"}), - functionName: "toggleFavorite" - })) + root.addItem(menuEntryComponent.createObject(root, + { + text: Qt.binding(function() { return favoritesProxy.count === 0 ? qsTr("Mark as favorite") : qsTr("Remove from favorites")}), + iconSource: Qt.binding(function() { return favoritesProxy.count === 0 ? "../images/starred.svg" : "../images/non-starred.svg"}), + functionName: "toggleFavorite" + })) - root.addItem(menuEntryComponent.createObject(root, - { - text: qsTr("Grouping"), - iconSource: "../images/view-grid-symbolic.svg", - functionName: "addToGroup" - })) - } + root.addItem(menuEntryComponent.createObject(root, + { + text: qsTr("Grouping"), + iconSource: "../images/view-grid-symbolic.svg", + functionName: "addToGroup" + })) print("*** creating menu") print("NFC", NfcHelper.isAvailable) diff --git a/nymea-app/ui/customviews/GenericTypeLogView.qml b/nymea-app/ui/customviews/GenericTypeLogView.qml index 5a418766..d99e8ea3 100644 --- a/nymea-app/ui/customviews/GenericTypeLogView.qml +++ b/nymea-app/ui/customviews/GenericTypeLogView.qml @@ -54,10 +54,8 @@ Item { SwipeDelegateGroup {} onContentYChanged: { - if (!engine.jsonRpcClient.ensureServerVersion("1.10")) { - if (!logsModel.busy && contentY - originY < 5 * height) { - logsModel.fetchEarlier(24) - } + if (!logsModel.busy && contentY - originY < 5 * height) { + logsModel.fetchEarlier(24) } } diff --git a/nymea-app/ui/devicepages/DeviceLogPage.qml b/nymea-app/ui/devicepages/DeviceLogPage.qml index 6c5d612d..c1ae039d 100644 --- a/nymea-app/ui/devicepages/DeviceLogPage.qml +++ b/nymea-app/ui/devicepages/DeviceLogPage.qml @@ -126,9 +126,8 @@ Page { case "uint": case "int": case "double": - return true; case "bool": - return engine.jsonRpcClient.ensureServerVersion("1.10") + return true; } print("not showing graph for", stateType.type) return false; diff --git a/nymea-app/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml index a442afb2..f3c40c39 100644 --- a/nymea-app/ui/devicepages/StateLogPage.qml +++ b/nymea-app/ui/devicepages/StateLogPage.qml @@ -46,9 +46,8 @@ Page { switch (root.stateType.type) { case "Int": case "Double": - return true; case "Bool": - return engine.jsonRpcClient.ensureServerVersion("1.10") + return true; } print("not showing graph for", root.stateType.type) return false; @@ -94,7 +93,7 @@ Page { width: swipeView.width height: swipeView.height - logsModel: engine.jsonRpcClient.ensureServerVersion("1.10") ? logsModelNg : logsModel + logsModel: logsModelNg onAddRuleClicked: { var value = logView.logsModel.get(index).value @@ -119,11 +118,7 @@ Page { height: swipeView.height Component.onCompleted: { var source; - if (engine.jsonRpcClient.ensureServerVersion("1.10")) { - source = Qt.resolvedUrl("../customviews/GenericTypeGraph.qml"); - } else { - source = Qt.resolvedUrl("../customviews/GenericTypeGraphPre110.qml"); - } + source = Qt.resolvedUrl("../customviews/GenericTypeGraph.qml"); setSource(source, {device: root.device, stateType: root.stateType}) } } diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml index 54e0a2ac..0f3f219d 100644 --- a/nymea-app/ui/magic/EditRulePage.qml +++ b/nymea-app/ui/magic/EditRulePage.qml @@ -45,7 +45,7 @@ Page { readonly property bool isEventBased: rule.eventDescriptors.count > 0 || rule.timeDescriptor.timeEventItems.count > 0 readonly property bool isStateBased: (rule.stateEvaluator !== null || rule.timeDescriptor.calendarItems.count > 0) readonly property bool actionsVisible: true - readonly property bool exitActionsVisible: engine.jsonRpcClient.ensureServerVersion("1.7") && isStateBased + readonly property bool exitActionsVisible: isStateBased readonly property bool hasActions: rule.actions.count > 0 readonly property bool hasExitActions: rule.exitActions.count > 0 readonly property bool isEmpty: !isEventBased && !isStateBased && !hasActions @@ -380,7 +380,7 @@ Page { columnSpacing: app.margins rowSpacing: app.margins Layout.preferredHeight: opacity > 0 ? implicitHeight : 0 - opacity: engine.jsonRpcClient.ensureServerVersion(1.6) && ruleSettings.showDetails && root.rule.executable ? 1 : 0 + opacity: ruleSettings.showDetails && root.rule.executable ? 1 : 0 Behavior on Layout.preferredHeight { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad} } Behavior on opacity { NumberAnimation {duration: 200; easing.type: Easing.InOutQuad } }