From 763445fe9f34caebade98f1c0c32c86c318b4217 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 16 Mar 2021 23:59:29 +0100
Subject: [PATCH] Fix refreshing the push token

---
 androidservice/androidservice.pro             | 2 +-
 libnymea-app/applogcontroller.cpp             | 2 ++
 nymea-app/nymea-app.pro                       | 2 ++
 nymea-app/ui/RootItem.qml                     | 2 +-
 nymea-app/ui/components/NymeaItemDelegate.qml | 1 +
 nymea-app/ui/delegates/InterfaceTile.qml      | 2 +-
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/androidservice/androidservice.pro b/androidservice/androidservice.pro
index dfb3c431..febffa09 100644
--- a/androidservice/androidservice.pro
+++ b/androidservice/androidservice.pro
@@ -5,7 +5,7 @@ QT += core androidextras
 QT += network qml quick quickcontrols2 svg websockets bluetooth charts nfc
 
 include(../config.pri)
-include(../android_openssl/openssl.pri)
+include(../3rdParty/android/android_openssl/openssl.pri)
 
 
 INCLUDEPATH += $$top_srcdir/libnymea-app/
diff --git a/libnymea-app/applogcontroller.cpp b/libnymea-app/applogcontroller.cpp
index 3c3fc79c..1f69b37f 100644
--- a/libnymea-app/applogcontroller.cpp
+++ b/libnymea-app/applogcontroller.cpp
@@ -229,6 +229,8 @@ void AppLogController::updateFilters()
         loggingRules << QString("%1.info=%2").arg(category).arg(level >= LogLevelInfo ? "true" : "false");
         loggingRules << QString("%1.warn=%2").arg(category).arg(level >= LogLevelWarning ? "true" : "false");
     }
+    loggingRules << "qt.qml.connections.warning=false";
+
     QLoggingCategory::setFilterRules(loggingRules.join('\n'));
 }
 
diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index b5306293..cd98c169 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -13,6 +13,7 @@ win32:CXX_FLAGS += /w
 
 linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common
 PRE_TARGETDEPS += ../libnymea-app
+linux:!android:PRE_TARGETDEPS += $$top_builddir/libnymea-app/libnymea-app.a
 
 HEADERS += \
     mainmenumodel.h \
@@ -61,6 +62,7 @@ android {
 
     # https://bugreports.qt.io/browse/QTBUG-83165
     LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
+    PRE_TARGETDEPS += $$top_builddir/libnymea-app/$${ANDROID_TARGET_ARCH}/libnymea-app.a
 
     DISTFILES += \
         $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index c2deef0b..044bc324 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -318,7 +318,7 @@ Item {
                                                     { "paramTypeId": tokenParam.paramTypeId, "value": PushNotifications.coreToken }
                                                 ];
                                         print("Reconfiguring PushNotifications for", thing.name)
-                                        engine.thingManager.reconfigureDevice(thing.id, params);
+                                        engine.thingManager.reconfigureThing(thing.id, params);
                                     } else {
                                         print("Push notifications don't need to be updated. Token is valid.")
                                     }
diff --git a/nymea-app/ui/components/NymeaItemDelegate.qml b/nymea-app/ui/components/NymeaItemDelegate.qml
index fbac58d1..5dfc4bb8 100644
--- a/nymea-app/ui/components/NymeaItemDelegate.qml
+++ b/nymea-app/ui/components/NymeaItemDelegate.qml
@@ -41,6 +41,7 @@ import Nymea 1.0
 
 ItemDelegate {
     id: root
+    implicitHeight: Style.smallDelegateHeight
 
     property string subText
     property bool progressive: true
diff --git a/nymea-app/ui/delegates/InterfaceTile.qml b/nymea-app/ui/delegates/InterfaceTile.qml
index 53e858e4..e42ee63e 100644
--- a/nymea-app/ui/delegates/InterfaceTile.qml
+++ b/nymea-app/ui/delegates/InterfaceTile.qml
@@ -159,7 +159,7 @@ MainPageTile {
         }
         sourceComponent: {
             if (!root.iface) {
-                return ""
+                return null
             }
 
             switch (iface.name) {