Merge pull request #1240 from deXol/develop

Use SnoreToast from installed folder, fix #1238
mooltipass · Aug 15, 2024 · ae23b62 · ae23b62
2 parents 362365e + d824d98
commit ae23b62
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/SystemNotifications/SystemNotificationWindows.cpp b/src/SystemNotifications/SystemNotificationWindows.cpp
@@ -37,7 +37,8 @@ typedef NTSTATUS (NTAPI *PNTQUERYWNFSTATEDATA)(
     _Out_writes_bytes_to_opt_(*BufferSize, *BufferSize) PVOID Buffer,
     _Inout_ PULONG BufferSize);
 
-const QString SystemNotificationWindows::SNORETOAST= "SnoreToast.exe";
+const QString SystemNotificationWindows::SNORETOAST_EXE = "SnoreToast.exe";
+const QString SystemNotificationWindows::SNORETOAST= [](){ return findSnoreToast(QDir::currentPath()); }();
 const QString SystemNotificationWindows::SNORETOAST_INSTALL= "-install";
 const QString SystemNotificationWindows::NOTIFICATIONS_SETTING_REGENTRY = "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Notifications\\Settings";
 const QString SystemNotificationWindows::DND_ENABLED_REGENTRY = "NOC_GLOBAL_SETTING_TOASTS_ENABLED";
@@ -53,7 +54,6 @@ SystemNotificationWindows::SystemNotificationWindows(QObject *parent)
     process = new QProcess();
     notificationMap = new NotificationMap();
     messageMap = new MessageMap();
-    installSnoreToast();
 }
 
 SystemNotificationWindows::~SystemNotificationWindows()
@@ -155,6 +155,29 @@ bool SystemNotificationWindows::displayDomainSelectionNotification(const QString
     }
 }
 
+QString SystemNotificationWindows::findSnoreToast(QString path)
+{
+    QDirIterator it{path, QDirIterator::Subdirectories};
+    while (it.hasNext())
+    {
+        QString filename = it.next();
+        QFileInfo file{filename};
+
+        if (file.isDir())
+        {
+            continue;
+        }
+
+        if (file.fileName().contains(SNORETOAST_EXE, Qt::CaseInsensitive))
+        {
+            qDebug() << "SnoreToast path: " << file.absoluteFilePath();
+            return file.absoluteFilePath();
+        }
+    }
+    qWarning() << "SnoreToast is not available.";
+    return "";
+}
+
 void SystemNotificationWindows::installSnoreToast()
 {
     if (IS_WIN10_OR_ABOVE)

diff --git a/src/SystemNotifications/SystemNotificationWindows.h b/src/SystemNotifications/SystemNotificationWindows.h
@@ -30,6 +30,9 @@ class SystemNotificationWindows : public ISystemNotification
     virtual bool displayLoginRequestNotification(const QString& service, QString &loginName, QString message) override;
     virtual bool displayDomainSelectionNotification(const QString& domain, const QString& subdomain, QString &serviceName, QString message) override;
 
+    static QString findSnoreToast(QString path);
+
+    const static QString SNORETOAST_EXE;
     const static QString SNORETOAST;
     const static QString SNORETOAST_INSTALL;
     const static QString NOTIFICATIONS_SETTING_REGENTRY;