Merge lp:~laney/telephony-service/accountsservice into lp:telephony-service

[Iain Lane]

Read the user's ringtone, message tone and silent mode settings from AccountsService instead of GSettings

Once https://code.launchpad.net/~laney/ubuntu-system-settings/as-ringtone/+merge/200862 is released to distro, u-s-s will set accountsservice properties for the ringtone, message tone and silent-mode.

This branch converts telephony-service to read those.

It just does it for the current user. In future, we'll need to use logind to get the active user and play that user's ringtone. That's the important part we win by switching to AS.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:764
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/84/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

@boiko: hey, could you review this please?

[Gustavo Pichorim Boiko (boiko)]

271 + void slotChanged(QString, QVariantMap, QStringList);
272 + void slotNameOwnerChanged(QString, QString, QString);

Just to be consistent with other classes, would you mind renaming those to:
onChanged and onNameOwnerChanged ?

review: Needs Fixing

[Gustavo Pichorim Boiko (boiko)]

I tried the code from this MR together with the other required packages, and it works for the first time, but if telephony-service-approver is already running, it doesn't seem to be reading the new incoming call sound correctly.

review: Needs Fixing

[lp:~laney/telephony-service/accountsservice]

765. By Iain Lane on 2014-01-29

Rename slot* to on*

766. By Iain Lane on 2014-01-29

Use invalidatedProperties instead of changedProperties to fix change notification

[Iain Lane (laney)]

Fixed both, I think - could you try again?

If you like, you can use a command like

  sudo gdbus call -y -d org.freedesktop.Accounts -o /org/freedesktop/Accounts/User32011 -m org.freedesktop.DBus.Properties.Set com.ubuntu.touch.AccountsService.Sound IncomingCallSound "<'/usr/share/sounds/ubuntu/ringtones/Soul.ogg'>"

to update the ringtone so that you don't have to go through system-settings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:766
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/102/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good now, and works as expected!

review: Approve

[Gustavo Pichorim Boiko (boiko)]

As this needs to be synchronized with the ubuntu-system-settings MR, feel free to top approve it once the changes are ready to land.

[Bill Filler (bfiller)]

@laney
Is there an MR for the u-s-s related change that is necessary? Can request a release for both together..

[Bill Filler (bfiller)]

nm, see it in the description

[Michael Terry (mterry)]

Just tested this, works great.

review: Approve

[lp:~laney/telephony-service/accountsservice]

767. By Iain Lane on 2014-03-03

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:767
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/118/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-07 19:53:45 +0000
+++ CMakeLists.txt	2014-03-03 16:11:46 +0000
@@ -61,7 +61,6 @@
 pkg_check_modules(TP_QT5 REQUIRED TelepathyQt5)
 pkg_check_modules(NOTIFY REQUIRED libnotify)
 pkg_check_modules(MESSAGING_MENU REQUIRED messaging-menu)
-pkg_check_modules(GSETTINGS REQUIRED gsettings-qt)
 pkg_check_modules(UserMetrics REQUIRED libusermetricsinput-1)
 
 add_definitions(-DQT_NO_KEYWORDS)

=== modified file 'approver/CMakeLists.txt'
--- approver/CMakeLists.txt	2013-12-21 23:44:41 +0000
+++ approver/CMakeLists.txt	2014-03-03 16:11:46 +0000
@@ -11,7 +11,6 @@
 include_directories(
     ${TP_QT5_INCLUDE_DIRS}
     ${NOTIFY_INCLUDE_DIRS}
-    ${GSETTINGS_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/libtelephonyservice
     ${CMAKE_CURRENT_BINARY_DIR}
     )
@@ -25,7 +24,6 @@
 target_link_libraries(telephony-service-approver
     ${TP_QT5_LIBRARIES}
     ${NOTIFY_LIBRARIES}
-    ${GSETTINGS_LIBRARIES}
     telephonyservice
     )
 

=== modified file 'debian/control'
--- debian/control	2014-01-29 15:16:16 +0000
+++ debian/control	2014-03-03 16:11:46 +0000
@@ -10,7 +10,6 @@
                gnome-keyring,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
-               libgsettings-qt-dev,
                libicu-dev,
                libmessaging-menu-dev,
                libnotify-dev,
@@ -40,7 +39,7 @@
 Pre-Depends: dpkg (>= 1.15.6~)
 Conflicts: phone-app
 Replaces: phone-app
-Depends: gsettings-ubuntu-touch-schemas (>= 0.0.1+13.10.20130730),
+Depends: accountsservice-ubuntu-touch-schemas,
          history-service,
          libnotify4,
          telepathy-mission-control-5,

=== modified file 'indicator/CMakeLists.txt'
--- indicator/CMakeLists.txt	2013-09-25 21:18:46 +0000
+++ indicator/CMakeLists.txt	2014-03-03 16:11:46 +0000
@@ -13,7 +13,6 @@
     ${TP_QT5_INCLUDE_DIRS}
     ${NOTIFY_INCLUDE_DIRS}
     ${MESSAGING_MENU_INCLUDE_DIRS}
-    ${GSETTINGS_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/libtelephonyservice
     ${CMAKE_CURRENT_BINARY_DIR}
     ${UserMetrics_INCLUDE_DIRS}
@@ -28,7 +27,6 @@
     ${TP_QT5_LIBRARIES}
     ${NOTIFY_LIBRARIES}
     ${MESSAGING_MENU_LIBRARIES}
-    ${GSETTINGS_LIBRARIES}
     ${UserMetrics_LIBRARIES}
     telephonyservice
     )

=== modified file 'libtelephonyservice/CMakeLists.txt'
--- libtelephonyservice/CMakeLists.txt	2014-01-20 12:57:43 +0000
+++ libtelephonyservice/CMakeLists.txt	2014-03-03 16:11:46 +0000
@@ -13,7 +13,6 @@
 
 include_directories(
     ${TP_QT5_INCLUDE_DIRS}
-    ${GSETTINGS_INCLUDE_DIRS}
     ${NOTIFY_INCLUDE_DIRS}
     )
 
@@ -25,8 +24,7 @@
 target_link_libraries(telephonyservice
                       ${TP_QT5_LIBRARIES}
                       ${UBUNTU_APP_LIB}
-                      ${NOTIFY_LIBRARIES}
-                      ${GSETTINGS_LIBRARIES})
+                      ${NOTIFY_LIBRARIES})
 
 qt5_use_modules(telephonyservice Contacts Core DBus Multimedia Qml Quick)
 

=== modified file 'libtelephonyservice/ringtone.cpp'
--- libtelephonyservice/ringtone.cpp	2013-08-29 22:10:16 +0000
+++ libtelephonyservice/ringtone.cpp	2014-03-03 16:11:46 +0000
@@ -21,17 +21,115 @@
 
 #include "ringtone.h"
 
+#define AS_SERVICE "org.freedesktop.Accounts"
+#define AS_PATH "/org/freedesktop/Accounts"
+#define AS_IFACE "org.freedesktop.Accounts"
+#define AS_EXTENSION_IFACE "com.ubuntu.touch.AccountsService.Sound"
+
 RingtoneWorker::RingtoneWorker(QObject *parent) :
     QObject(parent), mCallAudioPlayer(this), mCallAudioPlaylist(this),
-    mMessageAudioPlayer(this), mSoundSettings("com.ubuntu.touch.sound")
+    mMessageAudioPlayer(this),
+    mSystemBusConnection(QDBusConnection::systemBus()),
+    mServiceWatcher(AS_SERVICE,
+                     mSystemBusConnection,
+                     QDBusServiceWatcher::WatchForOwnerChange),
+    mAccountsserviceIface(AS_SERVICE,
+                           AS_PATH,
+                           AS_IFACE,
+                           mSystemBusConnection)
 {
     mCallAudioPlaylist.setPlaybackMode(QMediaPlaylist::Loop);
     mCallAudioPlaylist.setCurrentIndex(0);
+
+    connect (&mServiceWatcher,
+             SIGNAL (serviceOwnerChanged (QString, QString, QString)),
+             this,
+             SLOT (onNameOwnerChanged (QString, QString, QString)));
+
+    if (mAccountsserviceIface.isValid()) {
+        setUpInterface();
+    }
+}
+
+void RingtoneWorker::onNameOwnerChanged(QString name,
+                                        QString oldOwner,
+                                        QString newOwner)
+{
+    Q_UNUSED (oldOwner);
+    Q_UNUSED (newOwner);
+    if (name != "org.freedesktop.Accounts")
+        return;
+
+    setUpInterface();
+}
+
+void RingtoneWorker::onChanged(QString interface,
+                               QVariantMap changedProperties,
+                               QStringList invalidatedProperties)
+{
+    Q_UNUSED (interface);
+    Q_UNUSED (changedProperties);
+
+    if (invalidatedProperties.contains("SilentMode"))
+        mSilentMode = getUserProperty("SilentMode").toBool();
+
+    if (invalidatedProperties.contains("IncomingCallSound"))
+        mIncomingCallSound = getUserProperty("IncomingCallSound").toString();
+
+    if (invalidatedProperties.contains("IncomingMessageSound"))
+        mIncomingMessageSound = getUserProperty("IncomingMessageSound").toString();
+}
+
+void RingtoneWorker::setUpInterface()
+{
+    /* Here we should figure out which is the active user and get that user's
+     * AS object path. */
+    QDBusReply<QDBusObjectPath> qObjectPath = mAccountsserviceIface.call(
+                "FindUserById", qlonglong(getuid()));
+
+    if (qObjectPath.isValid()) {
+        mObjectPath = qObjectPath.value().path();
+        mAccountsserviceIface.connection().connect(
+            mAccountsserviceIface.service(),
+            mObjectPath,
+            "org.freedesktop.DBus.Properties",
+            "PropertiesChanged",
+            this,
+            SLOT(onChanged(QString, QVariantMap, QStringList)));
+
+        mSilentMode = getUserProperty("SilentMode").toBool();
+        mIncomingCallSound = getUserProperty("IncomingCallSound").toString();
+        mIncomingMessageSound = getUserProperty("IncomingMessageSound").toString();
+    }
+}
+
+QVariant RingtoneWorker::getUserProperty(const QString property)
+{
+    if (!mAccountsserviceIface.isValid())
+        return QVariant();
+
+    QDBusInterface iface (
+                "org.freedesktop.Accounts",
+                mObjectPath,
+                "org.freedesktop.DBus.Properties",
+                mSystemBusConnection,
+                this);
+
+    if (iface.isValid()) {
+        QDBusReply<QDBusVariant> answer = iface.call(
+                    "Get",
+                    AS_EXTENSION_IFACE,
+                    property);
+        if (answer.isValid()) {
+            return answer.value().variant();
+        }
+    }
+    return QVariant();
 }
 
 void RingtoneWorker::playIncomingCallSound()
 {
-    if (mSoundSettings.get("silentMode") == true) {
+    if (mSilentMode) {
         return;
     }
 
@@ -40,7 +138,7 @@
     }
 
     mCallAudioPlaylist.clear();
-    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(mSoundSettings.get("incomingCallSound").toString()));
+    mCallAudioPlaylist.addMedia(QUrl::fromLocalFile(mIncomingCallSound));
     mCallAudioPlayer.setPlaylist(&mCallAudioPlaylist);
     mCallAudioPlayer.play();
 }
@@ -52,7 +150,7 @@
 
 void RingtoneWorker::playIncomingMessageSound()
 {
-    if (mSoundSettings.get("silentMode") == true) {
+    if (mSilentMode) {
         return;
     }
 
@@ -60,7 +158,7 @@
         return;
     }
 
-    mMessageAudioPlayer.setMedia(QUrl::fromLocalFile(mSoundSettings.get("incomingMessageSound").toString()));
+    mMessageAudioPlayer.setMedia(QUrl::fromLocalFile(mIncomingMessageSound));
     mMessageAudioPlayer.play();
 }
 

=== modified file 'libtelephonyservice/ringtone.h'
--- libtelephonyservice/ringtone.h	2013-08-23 01:49:53 +0000
+++ libtelephonyservice/ringtone.h	2014-03-03 16:11:46 +0000
@@ -24,10 +24,15 @@
 
 #include <QObject>
 #include <QThread>
-#include <QGSettings>
 #include <QMediaPlayer>
 #include <QMediaPlaylist>
 #include <QFile>
+#include <QDBusReply>
+#include <QDBusServiceWatcher>
+#include <QtDBus/QDBusInterface>
+#include <unistd.h>
+#include <sys/types.h>
+
 
 class RingtoneWorker : public QObject
 {
@@ -40,12 +45,29 @@
     void stopIncomingCallSound();
     void playIncomingMessageSound();
     void stopIncomingMessageSound();
+
+
+private Q_SLOTS:
+    void onChanged(QString, QVariantMap, QStringList);
+    void onNameOwnerChanged(QString, QString, QString);
+
 private:
     QMediaPlayer mCallAudioPlayer;
     QMediaPlaylist mCallAudioPlaylist;
 
     QMediaPlayer mMessageAudioPlayer;
-    QGSettings mSoundSettings;
+
+    QDBusConnection mSystemBusConnection;
+    QDBusServiceWatcher mServiceWatcher;
+    QDBusInterface mAccountsserviceIface;
+    QString mObjectPath;
+
+    bool mSilentMode;
+    QString mIncomingCallSound;
+    QString mIncomingMessageSound;
+
+    void setUpInterface();
+    QVariant getUserProperty(const QString property);
 };
 
 class Ringtone : public QObject