[lipstick] Use summary and body as fallbacks for their preview equiva…

…lents. JB#50564
sailfishos · Jul 27, 2020 · 058d26a · 058d26a
1 parent d45dd73
commit 058d26a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/notifications/notificationmanager.cpp b/src/notifications/notificationmanager.cpp
@@ -303,10 +303,11 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
 
     notification->restartProgressTimer();
 
+    const QString previewSummary(hints_.value(LipstickNotification::HINT_PREVIEW_SUMMARY).toString());
+    const QString previewBody(hints_.value(LipstickNotification::HINT_PREVIEW_BODY).toString());
+
     if (androidOrigin) {
         // If this notification includes a preview, ensure it has a non-empty body and summary
-        const QString previewSummary(hints_.value(LipstickNotification::HINT_PREVIEW_SUMMARY).toString());
-        const QString previewBody(hints_.value(LipstickNotification::HINT_PREVIEW_BODY).toString());
         if (!previewSummary.isEmpty()) {
             if (previewBody.isEmpty()) {
                 hints_.insert(LipstickNotification::HINT_PREVIEW_BODY, QStringLiteral(" "));
@@ -344,6 +345,15 @@ uint NotificationManager::Notify(const QString &appName, uint replacesId, const
             hints_.insert(LipstickNotification::HINT_APP_ICON, pidProperties.second);
         }
 
+        // Use the summary and body as fallback values for previewSummary and previewBody.
+        // (This can be avoided by setting them explicitly to empty strings.)
+        if (!hints_.contains(LipstickNotification::HINT_PREVIEW_SUMMARY)) {
+            hints_.insert(LipstickNotification::HINT_PREVIEW_SUMMARY, summary);
+        }
+        if (!hints_.contains(LipstickNotification::HINT_PREVIEW_BODY)) {
+            hints_.insert(LipstickNotification::HINT_PREVIEW_BODY, body);
+        }
+
         // Unspecified priority should result in medium priority to permit low priorities
         if (!hints_.contains(LipstickNotification::HINT_PRIORITY)) {
             hints_.insert(LipstickNotification::HINT_PRIORITY, DefaultNotificationPriority);