Added Twitter support and prepared facebook support

8 files changed, 59 insertions, 9 deletions

diff --git a/app/qml/pages/ManagerPage.qml b/app/qml/pages/ManagerPage.qml
index 04035da..ecb7610 100644
--- a/app/qml/pages/ManagerPage.qml
+++ b/app/qml/pages/ManagerPage.qml
@@ -45,6 +45,8 @@ Page {
         property bool notificationsMissedCall: true
         property bool notificationsEmails: false
         property bool notificationsMitakuuluu: true
+        property bool notificationsTwitter: true
+        property bool notificationsFacebook: true
         property bool notificationsOther: true
         property bool notificationsAll: false
     }
@@ -192,6 +194,25 @@ Page {
             }
 
             TextSwitch {
+                text: qsTr("Twitter")
+                checked: settings.notificationsTwitter
+                automaticCheck: false
+                onClicked: {
+                    settings.notificationsTwitter = !settings.notificationsTwitter;
+                }
+            }
+
+            TextSwitch {
+                visible: false //not yet supported
+                text: qsTr("Facebook")
+                checked: settings.notificationsFacebook
+                automaticCheck: false
+                onClicked: {
+                    settings.notificationsFacebook = !settings.notificationsFacebook;
+                }
+            }
+
+            TextSwitch {
                 text: qsTr("Other phone notification")
                 checked: settings.notificationsOther
                 automaticCheck: false
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index 4253465..bdda77b 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -31,6 +31,8 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan
     connect(notifications, SIGNAL(error(const QString &)), SLOT(onNotifyError(const QString &)));
     connect(notifications, SIGNAL(emailNotify(const QString &,const QString &,const QString &)), SLOT(onEmailNotify(const QString &,const QString &,const QString &)));
     connect(notifications, SIGNAL(smsNotify(const QString &,const QString &)), SLOT(onSmsNotify(const QString &,const QString &)));
+    connect(notifications, SIGNAL(twitterNotify(const QString &,const QString &)), SLOT(onTwitterNotify(const QString &,const QString &)));
+    connect(notifications, SIGNAL(facebookNotify(const QString &,const QString &)), SLOT(onFacebookNotify(const QString &,const QString &)));
 
     connect(watch, SIGNAL(messageDecoded(uint,QByteArray)), commands, SLOT(processMessage(uint,QByteArray)));
     connect(commands, SIGNAL(hangup()), SLOT(hangupAll()));
@@ -197,18 +199,23 @@ void Manager::onNotifyError(const QString &message)
 
 void Manager::onSmsNotify(const QString &sender, const QString &data)
 {
-    logger()->debug() << "SMS:";
-    logger()->debug() << sender;
-    logger()->debug() << data;
     watch->sendSMSNotification(sender, data);
 }
 
+void Manager::onTwitterNotify(const QString &sender, const QString &data)
+{
+    watch->sendTwitterNotification(sender, data);
+}
+
+
+void Manager::onFacebookNotify(const QString &sender, const QString &data)
+{
+    watch->sendFacebookNotification(sender, data);
+}
+
+
 void Manager::onEmailNotify(const QString &sender, const QString &data,const QString &subject)
 {
-    logger()->debug() << "Email:";
-    logger()->debug() << sender;
-    logger()->debug() << data;
-    logger()->debug() << subject;
     watch->sendEmailNotification(sender, data, subject);
 }
 
diff --git a/daemon/manager.h b/daemon/manager.h
index 9a82603..41e614b 100644
--- a/daemon/manager.h
+++ b/daemon/manager.h
@@ -76,6 +76,8 @@ protected slots:
     void onActiveVoiceCallStatusChanged();
     void onNotifyError(const QString &message);
     void onSmsNotify(const QString &sender, const QString &data);
+    void onTwitterNotify(const QString &sender, const QString &data);
+    void onFacebookNotify(const QString &sender, const QString &data);
     void onEmailNotify(const QString &sender, const QString &data,const QString &subject);
     void onMprisPropertiesChanged(QString,QMap<QString,QVariant>,QStringList);
     void setMprisMetadata(QDBusArgument metadata);
diff --git a/daemon/notificationmanager.cpp b/daemon/notificationmanager.cpp
index 58bb685..ad2c98f 100644
--- a/daemon/notificationmanager.cpp
+++ b/daemon/notificationmanager.cpp
@@ -166,6 +166,18 @@ void NotificationManager::Notify(const QString &app_name, uint replaces_id, cons
         emit this->smsNotify(hints.value("x-nemo-preview-body", "default").toString(),
                              hints.value("x-nemo-preview-summary", "default").toString()
                             );
+
+    } else if (app_name == "twitter-notifications-client") {
+
+        if (!settings->property("notificationsTwitter").toBool()) {
+            logger()->debug() << "Ignoring twitter notification because of setting!";
+            return;
+        }
+
+        emit this->twitterNotify(hints.value("x-nemo-preview-body", body).toString(),
+                             hints.value("x-nemo-preview-summary", summary).toString()
+                            );
+
     } else {
         //Prioritize x-nemo-preview* over dbus direct summary and body
         QString subject = hints.value("x-nemo-preview-summary", "").toString();
diff --git a/daemon/notificationmanager.h b/daemon/notificationmanager.h
index b1e8e1f..4695db9 100644
--- a/daemon/notificationmanager.h
+++ b/daemon/notificationmanager.h
@@ -26,6 +26,8 @@ public:
 Q_SIGNALS:
     void error(const QString &message);
     void smsNotify(const QString &sender, const QString &data);
+    void twitterNotify(const QString &sender, const QString &data);
+    void facebookNotify(const QString &sender, const QString &data);
     void emailNotify(const QString &sender, const QString &data,const QString &subject);
 
 public Q_SLOTS:
diff --git a/daemon/settings.h b/daemon/settings.h
index c685c31..1f2e2e5 100644
--- a/daemon/settings.h
+++ b/daemon/settings.h
@@ -12,6 +12,8 @@ class Settings : public MDConfGroup
     Q_PROPERTY(bool notificationsMissedCall MEMBER notificationsMissedCall NOTIFY notificationsMissedCallChanged)
     Q_PROPERTY(bool notificationsEmails MEMBER notificationsEmails NOTIFY notificationsEmailsChanged)
     Q_PROPERTY(bool notificationsMitakuuluu MEMBER notificationsMitakuuluu NOTIFY notificationsMitakuuluuChanged)
+    Q_PROPERTY(bool notificationsTwitter MEMBER notificationsTwitter NOTIFY notificationsTwitterChanged)
+    Q_PROPERTY(bool notificationsFacebook MEMBER notificationsFacebook NOTIFY notificationsFacebookChanged)
     Q_PROPERTY(bool notificationsOther MEMBER notificationsOther NOTIFY notificationsOtherChanged)
     Q_PROPERTY(bool notificationsAll MEMBER notificationsAll NOTIFY notificationsAllChanged)
     bool silentWhenConnected;
@@ -19,6 +21,8 @@ class Settings : public MDConfGroup
     bool notificationsMissedCall;
     bool notificationsEmails;
     bool notificationsMitakuuluu;
+    bool notificationsTwitter;
+    bool notificationsFacebook;
     bool notificationsOther;
     bool notificationsAll;
 
@@ -33,6 +37,8 @@ signals:
     void notificationsMissedCallChanged(bool);
     void notificationsEmailsChanged(bool);
     void notificationsMitakuuluuChanged(bool);
+    void notificationsTwitterChanged(bool);
+    void notificationsFacebookChanged(bool);
     void notificationsOtherChanged(bool);
     void notificationsAllChanged(bool);
 
diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index 7e70b50..2ad147e 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -266,7 +266,7 @@ void WatchConnector::sendSMSNotification(QString sender, QString data)
     sendNotification(leadSMS, sender, data, "");
 }
 
-void WatchConnector::sendFaceBookNotification(QString sender, QString data)
+void WatchConnector::sendFacebookNotification(QString sender, QString data)
 {
     sendNotification(leadFACEBOOK, sender, data, "");
 }
diff --git a/daemon/watchconnector.h b/daemon/watchconnector.h
index d09a8e3..31e861c 100644
--- a/daemon/watchconnector.h
+++ b/daemon/watchconnector.h
@@ -150,7 +150,7 @@ public slots:
     void sendNotification(uint lead, QString sender, QString data, QString subject);
     void sendSMSNotification(QString sender, QString data);
     void sendEmailNotification(QString sender, QString data, QString subject);
-    void sendFaceBookNotification(QString sender, QString data);
+    void sendFacebookNotification(QString sender, QString data);
     void sendTwitterNotification(QString sender, QString data);
     void sendMusicNowPlaying(QString track, QString album, QString artist);
     void sendPhoneVersion();