Merged in chriadam/base-sociald (pull request #11)

[sociald] Install Facebook system notification category - JB#5493
sailfishos · May 7, 2013 · f038e61 · f038e61
2 parents ec1cae3 + 947cf6f
commit f038e61
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/rpm/sociald.spec b/rpm/sociald.spec
@@ -1,6 +1,6 @@
 Name:       sociald
 Summary:    Syncs device data from social services
-Version:    0.0.5
+Version:    0.0.6
 Release:    1
 Group:      System/Applications
 License:    TBD
@@ -22,6 +22,7 @@ BuildRequires:  nemo-qml-plugin-notifications-devel
 BuildRequires:  eventfeed-devel
 BuildRequires:  libmeegotouchevents-devel
 Requires: lipstick-jolla-home
+Requires: nemo-qml-plugin-notifications
 
 %description
 A daemon process which provides data synchronization with various social services.
@@ -31,6 +32,7 @@ A daemon process which provides data synchronization with various social service
 %{_bindir}/sociald
 %{_datadir}/dbus-1/services/org.nemomobile.sociald.sync.service
 %{_datadir}/dbus-1/interfaces/org.nemomobile.sociald.sync.xml
+%{_datadir}/lipstick/notificationcategories/x-nemo.social.facebook.notification.conf
 %{_libdir}/systemd/user/sociald.service
 %{_libdir}/systemd/user/jolla-session.target.wants/sociald.service
 %config /etc/xdg/autostart/sociald.desktop

diff --git a/src/facebook/facebooknotificationsyncadaptor.cpp b/src/facebook/facebooknotificationsyncadaptor.cpp
@@ -59,6 +59,10 @@ FacebookNotificationSyncAdaptor::FacebookNotificationSyncAdaptor(SyncService *pa
     : FacebookDataTypeSyncAdaptor(parent, fbsa, SyncService::Notifications)
     , m_contactFetchRequest(new QContactFetchRequest(this))
 {
+    //: The text displayed for Facebook notifications on the lock screen
+    //% "New Facebook notification!"
+    QString NOTIFICATION_CATEGORY_TRANSLATED_TEXT = qtTrId("qtn_social_notifications_new_facebook");
+
     // can sync, enabled
     m_enabled = true;
     m_status = SocialNetworkSyncAdaptor::Inactive;
@@ -269,7 +273,7 @@ void FacebookNotificationSyncAdaptor::finishedHandler()
 
                 // post the notification to the notifications feed.
                 Notification *notif = new Notification;
-                notif->setCategory(QLatin1String("x-nemo.social.notification")); // XXX TODO: install this category?
+                notif->setCategory(QLatin1String("x-nemo.social.facebook.notification"));
                 notif->setSummary(title);
                 notif->setBody(title);
                 notif->setPreviewSummary(nameString);

diff --git a/src/facebook/x-nemo.social.facebook.notification.conf b/src/facebook/x-nemo.social.facebook.notification.conf
@@ -0,0 +1,8 @@
+x-nemo-icon=icon-s-service-facebook
+x-nemo-preview-icon=icon-s-service-facebook
+x-nemo-feedback=chat
+genericTextId=qtn_social_notifications_new_facebook
+genericTextCatalogue=sociald
+priority=60
+lowPowerModeIconId=icon-s-service-facebook
+statusAreaIconId=icon-s-service-facebook
diff --git a/src/src.pro b/src/src.pro
@@ -66,4 +66,8 @@ service.path = /usr/share/dbus-1/services/
 interface.files = org.nemomobile.sociald.sync.xml
 interface.path = /usr/share/dbus-1/interfaces/
 
-INSTALLS = target service interface ts_install engineering_english_install
+# lipstick notification categories
+notification_categories.files = facebook/x-nemo.social.facebook.notification.conf
+notification_categories.path = /usr/share/lipstick/notificationcategories/
+
+INSTALLS = target service interface notification_categories ts_install engineering_english_install