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

Merge PR #561: Fix refreshing the push token

Browse Source
This commit is contained in:
Jenkins nymea 2021-03-19 14:39:35 +01:00
commit 55b9483db4
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidservice/androidservice.pro
View File

@ -5,7 +5,7 @@ QT += core androidextras
QT += network qml quick quickcontrols2 svg websockets bluetooth charts nfc QT += network qml quick quickcontrols2 svg websockets bluetooth charts nfc
include(../config.pri) include(../config.pri)
include(../android_openssl/openssl.pri) include(../3rdParty/android/android_openssl/openssl.pri)
INCLUDEPATH += $$top_srcdir/libnymea-app/ INCLUDEPATH += $$top_srcdir/libnymea-app/

2
libnymea-app/applogcontroller.cpp
View File

@ -229,6 +229,8 @@ void AppLogController::updateFilters()
loggingRules << QString("%1.info=%2").arg(category).arg(level >= LogLevelInfo ? "true" : "false"); 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 << QString("%1.warn=%2").arg(category).arg(level >= LogLevelWarning ? "true" : "false");
} }
loggingRules << "qt.qml.connections.warning=false";
QLoggingCategory::setFilterRules(loggingRules.join('\n')); QLoggingCategory::setFilterRules(loggingRules.join('\n'));
} }

2
nymea-app/nymea-app.pro
View File

@ -13,6 +13,7 @@ win32:CXX_FLAGS += /w
linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common linux:!android:!nozeroconf:LIBS += -lavahi-client -lavahi-common
PRE_TARGETDEPS += ../libnymea-app PRE_TARGETDEPS += ../libnymea-app
linux:!android:PRE_TARGETDEPS += $$top_builddir/libnymea-app/libnymea-app.a
HEADERS += \ HEADERS += \
mainmenumodel.h \ mainmenumodel.h \
@ -61,6 +62,7 @@ android {
# https://bugreports.qt.io/browse/QTBUG-83165 # https://bugreports.qt.io/browse/QTBUG-83165
LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH} LIBS += -L$${top_builddir}/libnymea-app/$${ANDROID_TARGET_ARCH}
PRE_TARGETDEPS += $$top_builddir/libnymea-app/$${ANDROID_TARGET_ARCH}/libnymea-app.a
DISTFILES += \ DISTFILES += \
$$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \ $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \

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

@ -318,7 +318,7 @@ Item {
{ "paramTypeId": tokenParam.paramTypeId, "value": PushNotifications.coreToken } { "paramTypeId": tokenParam.paramTypeId, "value": PushNotifications.coreToken }
]; ];
print("Reconfiguring PushNotifications for", thing.name) print("Reconfiguring PushNotifications for", thing.name)
engine.thingManager.reconfigureDevice(thing.id, params); engine.thingManager.reconfigureThing(thing.id, params);
} else { } else {
print("Push notifications don't need to be updated. Token is valid.") print("Push notifications don't need to be updated. Token is valid.")
} }

1
nymea-app/ui/components/NymeaItemDelegate.qml
View File

@ -41,6 +41,7 @@ import Nymea 1.0
ItemDelegate { ItemDelegate {
id: root id: root
implicitHeight: Style.smallDelegateHeight
property string subText property string subText
property bool progressive: true property bool progressive: true

2
nymea-app/ui/delegates/InterfaceTile.qml
View File

@ -159,7 +159,7 @@ MainPageTile {
} }
sourceComponent: { sourceComponent: {
if (!root.iface) { if (!root.iface) {
return "" return null
} }
switch (iface.name) { switch (iface.name) {