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

Merge PR #513: Allow changing the connection given by the --connect flag

Browse Source
This commit is contained in:
Jenkins nymea 2021-01-20 22:07:53 +01:00
commit 2e39a4f78a
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/ui/MainMenu.qml
View File

@ -61,8 +61,6 @@ Drawer {
ProgressButton { ProgressButton {
longpressEnabled: false longpressEnabled: false
imageSource: "../images/close.svg" imageSource: "../images/close.svg"
// When we're connected via command line arg, don't allow disconnecting
visible: autoConnectHost.length === 0
onClicked: { onClicked: {
root.currentEngine.jsonRpcClient.disconnectFromHost(); root.currentEngine.jsonRpcClient.disconnectFromHost();
root.close(); root.close();

9
nymea-app/ui/RootItem.qml
View File

@ -179,10 +179,7 @@ Item {
Component.onCompleted: { Component.onCompleted: {
setupPushNotifications(); setupPushNotifications();
if (autoConnectHost.length > 0) { if (tabSettings.lastConnectedHost.length > 0) {
var host = nymeaDiscovery.nymeaHosts.createLanHost("Manual connection", autoConnectHost);
engine.jsonRpcClient.connectToHost(host)
} else if (tabSettings.lastConnectedHost.length > 0) {
print("Last connected host was", tabSettings.lastConnectedHost) print("Last connected host was", tabSettings.lastConnectedHost)
var cachedHost = nymeaDiscovery.nymeaHosts.find(tabSettings.lastConnectedHost); var cachedHost = nymeaDiscovery.nymeaHosts.find(tabSettings.lastConnectedHost);
if (cachedHost) { if (cachedHost) {
@ -190,7 +187,11 @@ Item {
return; return;
} }
print("Warning: There is a last connected host but UUID is unknown to discovery...") print("Warning: There is a last connected host but UUID is unknown to discovery...")
} else if (autoConnectHost.length > 0) {
var host = nymeaDiscovery.nymeaHosts.createLanHost(app.systemName, autoConnectHost);
engine.jsonRpcClient.connectToHost(host)
} }
PlatformHelper.hideSplashScreen(); PlatformHelper.hideSplashScreen();
pageStack.push(Qt.resolvedUrl("connection/ConnectPage.qml"), StackView.Immediate) pageStack.push(Qt.resolvedUrl("connection/ConnectPage.qml"), StackView.Immediate)
} }