fix some of the qml issues

Signed-off-by: Matthieu Gallien <[email protected]>
nextcloud · Apr 8, 2024 · 7e96369 · 7e96369
1 parent 6047e55
commit 7e96369
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
@@ -115,6 +115,8 @@ void Systray::create()
     if (_trayEngine) {
         if (!AccountManager::instance()->accounts().isEmpty()) {
             _trayEngine->rootContext()->setContextProperty("activityModel", UserModel::instance()->currentActivityModel());
+        } else {
+            _trayEngine->rootContext()->setContextProperty("activityModel", &_fakeActivityModel);
         }
 
         QQmlComponent trayWindowComponent(trayEngine(), QStringLiteral("qrc:/qml/src/gui/tray/Window.qml"));

diff --git a/src/gui/systray.h b/src/gui/systray.h
@@ -15,12 +15,12 @@
 #ifndef SYSTRAY_H
 #define SYSTRAY_H
 
-#include <QSystemTrayIcon>
-
 #include "accountmanager.h"
 #include "tray/usermodel.h"
 
+#include <QSystemTrayIcon>
 #include <QQmlNetworkAccessManagerFactory>
+#include <QStringListModel>
 
 class QScreen;
 class QQmlApplicationEngine;
@@ -188,6 +188,8 @@ private slots:
     QSet<qlonglong> _callsAlreadyNotified;
     QPointer<QObject> _editFileLocallyLoadingDialog;
     QVector<QQuickWindow*> _fileDetailDialogs;
+
+    QStringListModel _fakeActivityModel;
 };
 
 } // namespace OCC

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
@@ -966,7 +966,7 @@ ApplicationWindow {
             }
             Connections {
                 target: activityModel
-                onInteractiveActivityReceived: {
+                function onInteractiveActivityReceived() {
                     if (!activityList.atYBeginning) {
                         newActivitiesButtonLoader.active = true;
                     }