[commhistory-daemon] Don't set x-nemo-max-content-lines notification …

…hint. JB#50243

x-nemo-max-content-lines is currently set '1' to ensure the body text
is not shown for the notification. This hint has been deprecated, so
instead of setting that, just avoid setting a body and previewBody
instead.

SMS and MMS notifications should still show the body content, as those
previously had x-nemo-max-content-lines=6 to ensure the body was shown.

data/notifications/x-nemo.call.missed.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-missed-call
 urgency=2
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-feedback=call_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.call.missed.group.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-missed-call
 urgency=2
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-feedback=call_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.im.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-sms
 urgency=2
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=chat_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.mms.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-sms
 urgency=2
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.sms.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-sms
 urgency=2
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.voicemail-waiting.conf

@@ -1,6 +1,5 @@
 app_icon=icon-lock-voicemail
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-user-removable=false
 x-nemo-feedback=sms,sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.voicemail.conf

@@ -2,6 +2,5 @@ app_icon=icon-lock-voicemail
 urgency=2
 x-nemo-user-removable=false
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-feedback=sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

data/notifications/x-nemo.messaging.voicemail.group.conf

@@ -2,6 +2,5 @@ app_icon=icon-lock-voicemail
 urgency=2
 x-nemo-priority=120
 x-nemo-user-removable=false
-x-nemo-max-content-lines=1
 x-nemo-feedback=sms_exists
 x-nemo-led-disabled-without-body-and-summary=false

src/notificationgroup.cpp

@@ -2,7 +2,8 @@
 **
 ** This file is part of commhistory-daemon.
 **
-** Copyright (C) 2013 Jolla Ltd.
+** Copyright (C) 2020 Open Mobile Platform LLC.
+** Copyright (C) 2013 - 2019 Jolla Ltd.
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: John Brooks <john.brooks@jolla.com>
 **
@@ -145,10 +146,18 @@ void NotificationGroup::updateGroup()
         connect(mGroup, SIGNAL(closed(uint)), SLOT(onClosed(uint)));
     }
 
+    const QString body(notificationGroupText());
+
     mGroup->setAppName(groupName(m_collection));
     mGroup->setCategory(groupCategory(m_collection));
     mGroup->setSummary(mLocale.joinStringList(contactNames()));
-    mGroup->setBody(notificationGroupText());
+    if (m_collection != PersonalNotification::Voice
+            && m_collection != PersonalNotification::Voicemail) {
+        // For missed calls and voicemail, the Events view notification is compressed into one
+        // line with only the summary, as the body information is duplicated in the notification
+        // group header ('missed calls' or 'new voicemails').
+        mGroup->setBody(body);
+    }
     mGroup->setItemCount(mNotifications.size());
 
     // This group is only visible if the members are hidden
@@ -186,7 +195,7 @@ void NotificationGroup::updateGroup()
         preview.setAppName(mGroup->appName());
         preview.setCategory(mGroup->category() + QStringLiteral(".preview"));
         preview.setPreviewSummary(mGroup->summary());
-        preview.setPreviewBody(mGroup->body());
+        preview.setPreviewBody(body);
 
         NotificationManager::instance()->setNotificationProperties(&preview, mNotifications[0], grouped);
 

src/notificationmanager.cpp

@@ -2,6 +2,7 @@
 **
 ** This file is part of commhistory-daemon.
 **
+** Copyright (C) 2020 Open Mobile Platform LLC.
 ** Copyright (C) 2013-2016 Jolla Ltd.
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: John Brooks <john.brooks@jolla.com>
@@ -809,7 +810,6 @@ void NotificationManager::slotVoicemailWaitingChanged()
         voicemailNotification.setPreviewBody(txt_qtn_voicemail_prompt);
 
         voicemailNotification.setSummary(voicemailNotification.previewSummary());
-        voicemailNotification.setBody(voicemailNotification.previewBody());
 
         voicemailNotification.setItemCount(voicemailCount);