ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop checks for version less than 1.10 as we won't connect

Browse Source 
to that anyways any more
This commit is contained in:
Michael Zanetti 2021-02-20 23:25:01 +01:00
parent 74b30dcfa0
commit 67aa7ae172
7 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea-app/engine.cpp
View File

@ -150,13 +150,10 @@ void Engine::onConnectedChanged()
void Engine::onDeviceManagerFetchingChanged() void Engine::onDeviceManagerFetchingChanged()
{ {
if (!m_thingManager->fetchingData()) { if (!m_thingManager->fetchingData()) {
m_tagsManager->init();
m_ruleManager->init(); m_ruleManager->init();
m_scriptManager->init(); m_scriptManager->init();
m_nymeaConfiguration->init(); m_nymeaConfiguration->init();
m_systemController->init(); m_systemController->init();
if (m_jsonRpcClient->ensureServerVersion("1.7")) {
m_tagsManager->init();
}
} }
} }

1
nymea-app/ui/SettingsPage.qml
View File

@ -106,7 +106,6 @@ Page {
Pane { Pane {
Layout.fillWidth: true Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0 Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("1.9")
padding: 0 padding: 0
NymeaSwipeDelegate { NymeaSwipeDelegate {

26
nymea-app/ui/components/ThingContextMenu.qml
View File

@ -22,21 +22,19 @@ AutoSizeMenu {
root.addItem(menuEntryComponent.createObject(root, {text: qsTr("Logs"), iconSource: "../images/logs.svg", functionName: "openThingLogPage"})) 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,
root.addItem(menuEntryComponent.createObject(root, {
{ text: Qt.binding(function() { return favoritesProxy.count === 0 ? qsTr("Mark as favorite") : qsTr("Remove from favorites")}),
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"}),
iconSource: Qt.binding(function() { return favoritesProxy.count === 0 ? "../images/starred.svg" : "../images/non-starred.svg"}), functionName: "toggleFavorite"
functionName: "toggleFavorite" }))
}))
root.addItem(menuEntryComponent.createObject(root, root.addItem(menuEntryComponent.createObject(root,
{ {
text: qsTr("Grouping"), text: qsTr("Grouping"),
iconSource: "../images/view-grid-symbolic.svg", iconSource: "../images/view-grid-symbolic.svg",
functionName: "addToGroup" functionName: "addToGroup"
})) }))
}
print("*** creating menu") print("*** creating menu")
print("NFC", NfcHelper.isAvailable) print("NFC", NfcHelper.isAvailable)

6
nymea-app/ui/customviews/GenericTypeLogView.qml
View File

@ -54,10 +54,8 @@ Item {
SwipeDelegateGroup {} SwipeDelegateGroup {}
onContentYChanged: { onContentYChanged: {
if (!engine.jsonRpcClient.ensureServerVersion("1.10")) { if (!logsModel.busy && contentY - originY < 5 * height) {
if (!logsModel.busy && contentY - originY < 5 * height) { logsModel.fetchEarlier(24)
logsModel.fetchEarlier(24)
}
} }
} }

3
nymea-app/ui/devicepages/DeviceLogPage.qml
View File

@ -126,9 +126,8 @@ Page {
case "uint": case "uint":
case "int": case "int":
case "double": case "double":
return true;
case "bool": case "bool":
return engine.jsonRpcClient.ensureServerVersion("1.10") return true;
} }
print("not showing graph for", stateType.type) print("not showing graph for", stateType.type)
return false; return false;

11
nymea-app/ui/devicepages/StateLogPage.qml
View File

@ -46,9 +46,8 @@ Page {
switch (root.stateType.type) { switch (root.stateType.type) {
case "Int": case "Int":
case "Double": case "Double":
return true;
case "Bool": case "Bool":
return engine.jsonRpcClient.ensureServerVersion("1.10") return true;
} }
print("not showing graph for", root.stateType.type) print("not showing graph for", root.stateType.type)
return false; return false;
@ -94,7 +93,7 @@ Page {
width: swipeView.width width: swipeView.width
height: swipeView.height height: swipeView.height
logsModel: engine.jsonRpcClient.ensureServerVersion("1.10") ? logsModelNg : logsModel logsModel: logsModelNg
onAddRuleClicked: { onAddRuleClicked: {
var value = logView.logsModel.get(index).value var value = logView.logsModel.get(index).value
@ -119,11 +118,7 @@ Page {
height: swipeView.height height: swipeView.height
Component.onCompleted: { Component.onCompleted: {
var source; var source;
if (engine.jsonRpcClient.ensureServerVersion("1.10")) { source = Qt.resolvedUrl("../customviews/GenericTypeGraph.qml");
source = Qt.resolvedUrl("../customviews/GenericTypeGraph.qml");
} else {
source = Qt.resolvedUrl("../customviews/GenericTypeGraphPre110.qml");
}
setSource(source, {device: root.device, stateType: root.stateType}) setSource(source, {device: root.device, stateType: root.stateType})
} }
} }

4
nymea-app/ui/magic/EditRulePage.qml
View File

@ -45,7 +45,7 @@ Page {
readonly property bool isEventBased: rule.eventDescriptors.count > 0 || rule.timeDescriptor.timeEventItems.count > 0 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 isStateBased: (rule.stateEvaluator !== null || rule.timeDescriptor.calendarItems.count > 0)
readonly property bool actionsVisible: true 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 hasActions: rule.actions.count > 0
readonly property bool hasExitActions: rule.exitActions.count > 0 readonly property bool hasExitActions: rule.exitActions.count > 0
readonly property bool isEmpty: !isEventBased && !isStateBased && !hasActions readonly property bool isEmpty: !isEventBased && !isStateBased && !hasActions
@ -380,7 +380,7 @@ Page {
columnSpacing: app.margins columnSpacing: app.margins
rowSpacing: app.margins rowSpacing: app.margins
Layout.preferredHeight: opacity > 0 ? implicitHeight : 0 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 Layout.preferredHeight { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad} }
Behavior on opacity { NumberAnimation {duration: 200; easing.type: Easing.InOutQuad } } Behavior on opacity { NumberAnimation {duration: 200; easing.type: Easing.InOutQuad } }