From e645f82095aa62a8a2a3b1c1fa37191f68cf3a18 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Thu, 23 Apr 2020 17:44:58 +0200 Subject: [PATCH] Fix pushbutton auth appearing to fail on a first set --- libnymea-app/jsonrpc/jsonrpcclient.cpp | 3 +++ nymea-app/ui/PushButtonAuthPage.qml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libnymea-app/jsonrpc/jsonrpcclient.cpp b/libnymea-app/jsonrpc/jsonrpcclient.cpp index 6df4d6ae..eb482c77 100644 --- a/libnymea-app/jsonrpc/jsonrpcclient.cpp +++ b/libnymea-app/jsonrpc/jsonrpcclient.cpp @@ -165,6 +165,9 @@ void JsonRpcClient::notificationReceived(const QVariantMap &data) settings.beginGroup("jsonTokens"); settings.setValue(m_serverUuid, m_token); settings.endGroup(); + + m_initialSetupRequired = false; + emit authenticationRequiredChanged(); setNotificationsEnabled(); diff --git a/nymea-app/ui/PushButtonAuthPage.qml b/nymea-app/ui/PushButtonAuthPage.qml index 33f0c8ab..badce5e1 100644 --- a/nymea-app/ui/PushButtonAuthPage.qml +++ b/nymea-app/ui/PushButtonAuthPage.qml @@ -46,8 +46,8 @@ Page { } } - Component.objectName: { - engine.jsonRpcClient.requestPushButtonAuth(""); + Component.onCompleted: { + engine.jsonRpcClient.requestPushButtonAuth("nymea-app (" + PlatformHelper.deviceModel + ")"); } Connections {