Merge branch 'jb51257' into 'upgrade-3.4.0'

[commhistoryd] Backport notification changes to 3.4.0. Contributes to JB#51257 See merge request mer-core/commhistory-daemon!46
sailfishos · Oct 20, 2020 · 9bcbd79 · 9bcbd79
2 parents a472d3d + 6b0483a
commit 9bcbd79
Show file tree

Hide file tree

Showing 35 changed files with 345 additions and 824 deletions.
diff --git a/data/notifications/x-nemo.call.missed.conf b/data/notifications/x-nemo.call.missed.conf
@@ -1,7 +1,4 @@
-appIcon=icon-lock-missed-call
-urgency=2
-x-nemo-icon=icon-lock-missed-call
+app_icon=icon-lock-missed-call
+x-nemo-display-on=true
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-feedback=call_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.call.missed.group.conf b/data/notifications/x-nemo.call.missed.group.conf
@@ -1,7 +1,4 @@
-appIcon=icon-lock-missed-call
-urgency=2
-x-nemo-icon=icon-lock-missed-call
+app_icon=icon-lock-missed-call
+x-nemo-display-on=true
 x-nemo-priority=120
-x-nemo-max-content-lines=1
 x-nemo-feedback=call_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.authorizationrequest.conf b/data/notifications/x-nemo.messaging.authorizationrequest.conf
@@ -1,6 +1,4 @@
-appIcon=icon-lock-sms
-x-nemo-icon=icon-lock-invitation
-x-nemo-preview-icon=icon-s-status-invitation-pending
+app_icon=icon-s-status-invitation-pending
 x-nemo-feedback=default
 x-nemo-user-removable=false
 x-nemo-priority=90
diff --git a/data/notifications/x-nemo.messaging.error.conf b/data/notifications/x-nemo.messaging.error.conf
@@ -1,3 +1,3 @@
-appIcon=icon-lock-information
-urgency=2
+app_icon=icon-lock-information
+x-nemo-display-on=true
 transient=true
diff --git a/data/notifications/x-nemo.messaging.error.strong.conf b/data/notifications/x-nemo.messaging.error.strong.conf
@@ -1,4 +1,4 @@
-appIcon=icon-lock-information
-urgency=2
+app_icon=icon-lock-information
+x-nemo-display-on=true
 transient=true
 x-nemo-feedback=warning_strong
diff --git a/data/notifications/x-nemo.messaging.group.conf b/data/notifications/x-nemo.messaging.group.conf
@@ -1,6 +1,4 @@
-appIcon=icon-lock-sms
-urgency=2
-x-nemo-icon=icon-lock-sms
+app_icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.group.preview.conf b/data/notifications/x-nemo.messaging.group.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-sms
+app_icon=icon-lock-sms
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.im.conf b/data/notifications/x-nemo.messaging.im.conf
@@ -1,7 +1,4 @@
-appIcon=icon-lock-sms
-urgency=2
-x-nemo-icon=icon-lock-sms
+app_icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=chat_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.im.preview.conf b/data/notifications/x-nemo.messaging.im.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-sms
+app_icon=icon-lock-sms
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=chat
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.mms.conf b/data/notifications/x-nemo.messaging.mms.conf
@@ -1,7 +1,4 @@
-appIcon=icon-lock-sms
-urgency=2
-x-nemo-icon=icon-lock-sms
+app_icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=sms_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.mms.preview.conf b/data/notifications/x-nemo.messaging.mms.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-sms
+app_icon=icon-lock-sms
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.sms.conf b/data/notifications/x-nemo.messaging.sms.conf
@@ -1,7 +1,4 @@
-appIcon=icon-lock-sms
-urgency=2
-x-nemo-icon=icon-lock-sms
+app_icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
-x-nemo-max-content-lines=6
 x-nemo-feedback=sms_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.sms.preview.conf b/data/notifications/x-nemo.messaging.sms.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-sms
+app_icon=icon-lock-sms
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.voicemail-SMS.conf b/data/notifications/x-nemo.messaging.voicemail-SMS.conf
@@ -1,6 +1,4 @@
-appIcon=icon-lock-sms
-urgency=2
-x-nemo-icon=icon-lock-sms
+app_icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms_exists
-x-nemo-led-disabled-without-body-and-summary=false
diff --git a/data/notifications/x-nemo.messaging.voicemail-SMS.preview.conf b/data/notifications/x-nemo.messaging.voicemail-SMS.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-sms
+app_icon=icon-lock-sms
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-sms
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.voicemail-waiting.conf b/data/notifications/x-nemo.messaging.voicemail-waiting.conf
@@ -1,9 +1,5 @@
-appIcon=icon-lock-voicemail
-x-nemo-icon=icon-lock-voicemail
-x-nemo-preview-icon=icon-lock-voicemail
+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
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.voicemail.conf b/data/notifications/x-nemo.messaging.voicemail.conf
@@ -1,8 +1,5 @@
-appIcon=icon-lock-voicemail
-urgency=2
-x-nemo-icon=icon-lock-voicemail
+app_icon=icon-lock-voicemail
+x-nemo-display-on=true
 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
diff --git a/data/notifications/x-nemo.messaging.voicemail.group.conf b/data/notifications/x-nemo.messaging.voicemail.group.conf
@@ -1,8 +1,5 @@
-appIcon=icon-lock-voicemail
-urgency=2
-x-nemo-icon=icon-lock-voicemail
+app_icon=icon-lock-voicemail
+x-nemo-display-on=true
 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
diff --git a/data/notifications/x-nemo.messaging.voicemail.group.preview.conf b/data/notifications/x-nemo.messaging.voicemail.group.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-voicemail
+app_icon=icon-lock-voicemail
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-voicemail
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/data/notifications/x-nemo.messaging.voicemail.preview.conf b/data/notifications/x-nemo.messaging.voicemail.preview.conf
@@ -1,7 +1,6 @@
-appIcon=icon-lock-voicemail
+app_icon=icon-lock-voicemail
 transient=true
-urgency=2
-x-nemo-preview-icon=icon-lock-voicemail
+x-nemo-display-on=true
 x-nemo-priority=120
 x-nemo-feedback=sms
 x-nemo-display-on=true
diff --git a/rpm/commhistory-daemon.spec b/rpm/commhistory-daemon.spec
@@ -11,7 +11,7 @@ BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Contacts)
 BuildRequires:  pkgconfig(Qt5Versit)
 BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(commhistory-qt5) >= 1.9.33
+BuildRequires:  pkgconfig(commhistory-qt5) >= 1.10.1.1
 BuildRequires:  pkgconfig(contactcache-qt5)
 BuildRequires:  pkgconfig(qtcontacts-sqlite-qt5-extensions)
 BuildRequires:  pkgconfig(TelepathyQt5)
@@ -20,16 +20,17 @@ BuildRequires:  pkgconfig(mlocale5)
 BuildRequires:  pkgconfig(mce)
 BuildRequires:  pkgconfig(ngf-qt5)
 BuildRequires:  pkgconfig(qt5-boostable)
-BuildRequires:  pkgconfig(nemonotifications-qt5) >= 1.0.5
+BuildRequires:  pkgconfig(nemonotifications-qt5) > 1.2.1
 BuildRequires:  qt5-qttools
 BuildRequires:  qt5-qttools-linguist
 BuildRequires:  libqofono-qt5-devel >= 0.89
 BuildRequires:  libqofonoext-devel
 BuildRequires:  python3-base
 BuildRequires:  systemd
-Requires:  libcommhistory-qt5 >= 1.9.33
+Requires:  libcommhistory-qt5 >= 1.10.1.1
 Requires:  libqofono-qt5 >= 0.66
 Requires:  mapplauncherd-qt5
+Requires:  nemo-qml-plugin-notifications-qt5 >= 1.2.1.1
 
 Obsoletes: smshistory <= 0.1.8
 Provides: smshistory > 0.1.8

diff --git a/src/constants.h b/src/constants.h
@@ -24,10 +24,6 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#include <CommHistory/Event>
-
-namespace RTComLogger {
-
 // Used to generate duiremoteaction strings
 #define OBJECT_PATH QLatin1String("/")
 
@@ -55,10 +51,10 @@ namespace RTComLogger {
 #define VOICEMAIL_METHOD       QLatin1String("voicemail")
 #define REPLACE_TYPE           QLatin1String("sms-replace-number")
 
-#define VOICEMAIL_WAITING_SERVICE      QLatin1String("com.jolla.voicecall.ui")
-#define VOICEMAIL_WAITING_OBJECT_PATH  QLatin1String("/")
-#define VOICEMAIL_WAITING_INTERFACE    QLatin1String("com.jolla.voicecall.ui")
-#define VOICEMAIL_WAITING_METHOD       QLatin1String("openUrl")
+#define VOICECALL_SERVICE      QLatin1String("com.jolla.voicecall.ui")
+#define VOICECALL_OBJECT_PATH  QLatin1String("/")
+#define VOICECALL_INTERFACE    QLatin1String("com.jolla.voicecall.ui")
+#define VOICECALL_DIAL_METHOD  QLatin1String("dial")
 
 // Custom hints for identifying notifications
 #define ACCOUNT_PATH_HINT   QLatin1String("x-org-nemomobile-qmlmessages.account.path")
@@ -96,30 +92,4 @@ namespace RTComLogger {
 #define VOICEMAIL_CONTACT_VMID_DIR  QLatin1String("contacts")
 #define VOICEMAIL_CONTACT_VMID_FILE QLatin1String("vmid")
 
-// events
-struct EventTypes {
-    int type;
-    const char* event;
-};
-
-static const EventTypes _eventTypes[] =
-{
-    {CommHistory::Event::IMEvent,       "x-nemo.messaging.im"},
-    {CommHistory::Event::SMSEvent,      "x-nemo.messaging.sms"},
-    {CommHistory::Event::MMSEvent,      "x-nemo.messaging.mms"},
-    {CommHistory::Event::CallEvent,     "x-nemo.call.missed"},
-    {CommHistory::Event::VoicemailEvent,"x-nemo.messaging.voicemail"},
-    {VOICEMAIL_SMS_EVENT_TYPE,          "x-nemo.messaging.voicemail-SMS"}
-};
-
-static const int _eventTypesCount = sizeof(_eventTypes) / sizeof(EventTypes);
-
-// Custom system info notification types for commhistoryd:
-const QString ErrorCategory = "x-nemo.messaging.error";
-const QString StrongErrorCategory = "x-nemo.messaging.error.strong";
-
-const QString voicemailWaitingCategory = "x-nemo.messaging.voicemail-waiting";
-
-}
-
 #endif //#define CONSTANTS_H
diff --git a/src/locstrings.h b/src/locstrings.h
@@ -61,10 +61,10 @@
 #define txt_qtn_msg_contact_card_label qtTrId("qtn_msg_contact_card_label")
 //% "%1 | %2"
 #define txt_qtn_msg_notification_new_vcard(STR) qtTrId("qtn_msg_received_contact_card").arg(txt_qtn_msg_contact_card_label).arg(STR)
-//% "Show Messages"
-#define txt_qtn_msg_notification_show_messages qtTrId("txt_qtn_msg_notification_show_messages")
 //% "Reply"
 #define txt_qtn_msg_notification_reply qtTrId("qtn_msg_notification_reply")
+//% "Call"
+#define txt_qtn_msg_notification_call qtTrId("qtn_msg_notification_call")
 //% "%n attachment(s)"
 #define txt_qtn_mms_notification_attachment(NUM) qtTrId("qtn_mms_notification_attachment", NUM)
 //% "%1 | %2"
@@ -79,15 +79,15 @@
 #define txt_qtn_call_type_private qtTrId("qtn_call_type_private")
 //% "Voicemail"
 #define txt_qtn_call_type_voicemail qtTrId("qtn_call_type_voicemail")
-//% "Show call history"
-#define txt_qtn_call_notification_show_call_history qtTrId("txt_qtn_call_notification_show_call_history")
+//% "Call back"
+#define txt_qtn_call_notification_call_back qtTrId("txt_qtn_call_notification_call_back")
+//% "Send message"
+#define txt_qtn_call_notification_send_message qtTrId("txt_qtn_call_notification_send_message")
 
 //% "Tap to listen"
 #define txt_qtn_voicemail_prompt qtTrId("qtn_voicemail_prompt")
 //% "Call voicemail"
 #define txt_qtn_voicemail_notification_call qtTrId("txt_qtn_voicemail_notification_call")
-//% "Show voicemail"
-#define txt_qtn_voicemail_notification_show_voicemail qtTrId("txt_qtn_voicemail_notification_show_voicemail")
 
 //% "Multimedia message was delivered to %1"
 #define txt_qtn_msg_notification_delivered(STR) qtTrId("qtn_mms_info_delivered").arg(STR)