Merge pull request #101 from matthewvogt/mer-1117

[commhistory-daemon] Remove missed call notification preview. Contributes to MER#1117
sailfishos · Jun 19, 2015 · 9b057eb · 9b057eb
2 parents 57fd8a9 + a82db17
commit 9b057eb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/data/notifications/x-nemo.call.missed.group.preview.conf b/data/notifications/x-nemo.call.missed.group.preview.conf
diff --git a/data/notifications/x-nemo.call.missed.preview.conf b/data/notifications/x-nemo.call.missed.preview.conf
diff --git a/src/notificationgroup.cpp b/src/notificationgroup.cpp
@@ -178,8 +178,9 @@ void NotificationGroup::updateGroup()
     }
     mGroup->setTimestamp(groupTimestamp);
 
-    if (membersHidden && !allRestored) {
-        // Show a preview banner for this group update (unless we've just restored from storage)
+    // Show preview banner for this group update unless we've just restored from storage
+    // (missed calls have no preview as the incoming call dialog was just shown)
+    if ((m_collection != PersonalNotification::Voice) && membersHidden && !allRestored) {
         Notification preview;
 
         preview.setAppName(mGroup->appName());

diff --git a/src/personalnotification.cpp b/src/personalnotification.cpp
@@ -129,8 +129,9 @@ void PersonalNotification::publishNotification()
 
     NotificationManager::instance()->setNotificationProperties(m_notification, this, false);
 
-    if (!m_hidden && m_notification->replacesId() == 0) {
-        // Show preview banner for notifications not previously reported
+    // Show preview banner for notifications not previously reported
+    // (missed calls have no preview as the incoming call dialog was just shown)
+    if ((collection() != Voice) && !m_hidden && m_notification->replacesId() == 0) {
         Notification preview;
 
         preview.setAppName(m_notification->appName());