Merge lp:~tiagosh/telepathy-ofono/class0sms into lp:telepathy-ofono

[Tiago Salem Herrmann]

Add class 0 SMS support

Add class 0 SMS support.

This MR depends on this other MR: https://code.launchpad.net/~tiagosh/ubuntu/trusty/telepathy-qt5/class0sms/+merge/214099

--------------
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telephony-service/class0sms/+merge/214100
https://code.launchpad.net/~tiagosh/history-service/class0sms/+merge/214103
https://code.launchpad.net/~tiagosh/ubuntu/trusty/telepathy-qt5/class0sms/+merge/214099

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telepathy-ofono) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/83/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-trusty-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-trusty-armhf-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-trusty-i386-ci/61/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telepathy-ofono-ci/83/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, a dependent change on telepathy-qt5 is required for it to build.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'connection.cpp'
--- connection.cpp	2014-04-03 19:27:12 +0000
+++ connection.cpp	2014-04-03 19:27:12 +0000
@@ -250,6 +250,7 @@
     plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(contactsIface));
 
     QObject::connect(mOfonoMessageManager, SIGNAL(incomingMessage(QString,QVariantMap)), this, SLOT(onOfonoIncomingMessage(QString,QVariantMap)));
+    QObject::connect(mOfonoMessageManager, SIGNAL(immediateMessage(QString,QVariantMap)), this, SLOT(onOfonoImmediateMessage(QString,QVariantMap)));
     QObject::connect(mOfonoMessageManager, SIGNAL(statusReport(QString,QVariantMap)), this, SLOT(onDeliveryReportReceived(QString,QVariantMap)));
     QObject::connect(mOfonoVoiceCallManager, SIGNAL(callAdded(QString,QVariantMap)), SLOT(onOfonoCallAdded(QString, QVariantMap)));
     QObject::connect(mOfonoVoiceCallManager, SIGNAL(validityChanged(bool)), SLOT(onValidityChanged(bool)));
@@ -624,13 +625,18 @@
     Q_UNUSED(targetHandleType);
 
     QStringList phoneNumbers;
+    bool flash = false;
     if (hints.contains(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles"))) {
         phoneNumbers << inspectHandles(Tp::HandleTypeContact, qdbus_cast<Tp::UIntList>(hints[TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeHandles")]), error);
     } else {
         phoneNumbers << mHandles.value(targetHandle);
     }
 
-    oFonoTextChannel *channel = new oFonoTextChannel(this, phoneNumbers);
+    if (hints.contains(TP_QT_IFACE_CHANNEL_INTERFACE_SMS + QLatin1String(".Flash"))) {
+        flash = hints[TP_QT_IFACE_CHANNEL_INTERFACE_SMS + QLatin1String(".Flash")].toBool();
+    }
+
+    oFonoTextChannel *channel = new oFonoTextChannel(this, phoneNumbers, flash);
     mTextChannels << channel;
     QObject::connect(channel, SIGNAL(messageRead(QString)), SLOT(onMessageRead(QString)));
     QObject::connect(channel, SIGNAL(destroyed()), SLOT(onTextChannelClosed()));
@@ -683,32 +689,12 @@
         return Tp::BaseChannelPtr();
     }
 
-    Q_FOREACH(const QString &phoneNumber, mCallChannels.keys()) {
-        if (PhoneUtils::comparePhoneNumbers(phoneNumber, newPhoneNumber)) {
-            return mCallChannels[phoneNumber]->baseChannel();
-        }
-    }
-
-    bool isOngoingCall = false;
-    QDBusObjectPath objpath;
-    Q_FOREACH(const QString &callId, mOfonoVoiceCallManager->getCalls()) {
-        // check if this is an ongoing call
-        OfonoVoiceCall *call = new OfonoVoiceCall(callId);
-        if ((call->lineIdentification().isEmpty() && newPhoneNumber == "x-ofono-unknown") ||
-            (call->lineIdentification() == "withheld" && newPhoneNumber == "x-ofono-private") ||
-            PhoneUtils::comparePhoneNumbers(call->lineIdentification(), newPhoneNumber)) {
-            isOngoingCall = true;
-        }
-        call->deleteLater();
-        if (isOngoingCall) {
-            objpath.setPath(callId);
-            break;
-        }
-    }
-
-    if (!isOngoingCall) {
+    QDBusObjectPath objpath(hints["ofonoObjPath"].toString());
+
+    if (objpath.path().isEmpty()) {
         objpath = mOfonoVoiceCallManager->dial(newPhoneNumber, "", success);
     }
+
     qDebug() << "success " << success;
     if (objpath.path().isEmpty() || !success) {
         if (!success) {
@@ -719,8 +705,8 @@
         return Tp::BaseChannelPtr();
     }
 
-    oFonoCallChannel *channel = new oFonoCallChannel(this, newPhoneNumber, targetHandle,objpath.path());
-    mCallChannels[newPhoneNumber] = channel;
+    oFonoCallChannel *channel = new oFonoCallChannel(this, newPhoneNumber, targetHandle, objpath.path());
+    mCallChannels[objpath.path()] = channel;
     QObject::connect(channel, SIGNAL(destroyed()), SLOT(onCallChannelDestroyed()));
     QObject::connect(channel, SIGNAL(closed()), SLOT(onCallChannelClosed()));
     QObject::connect(channel, SIGNAL(merged()), SLOT(onCallChannelMerged()));
@@ -835,6 +821,16 @@
 
 void oFonoConnection::onOfonoIncomingMessage(const QString &message, const QVariantMap &info)
 {
+    ensureTextChannel(message, info, false);
+}
+
+void oFonoConnection::onOfonoImmediateMessage(const QString &message, const QVariantMap &info)
+{
+    ensureTextChannel(message, info, true);
+}
+
+void oFonoConnection::ensureTextChannel(const QString &message, const QVariantMap &info, bool flash)
+{
     const QString normalizedNumber = PhoneUtils::normalizePhoneNumber(info["Sender"].toString());
     // check if there is an open channel for this sender and use it
     oFonoTextChannel *channel = textChannelForMembers(QStringList() << normalizedNumber);
@@ -845,8 +841,10 @@
 
     Tp::DBusError error;
     bool yours;
+    QVariantMap hints;
+    hints[TP_QT_IFACE_CHANNEL_INTERFACE_SMS + QLatin1String(".Flash")] = flash;
     uint handle = newHandle(normalizedNumber);
-    ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_TEXT,Tp::HandleTypeContact, handle, yours, handle, false, QVariantMap(), &error);
+    ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_TEXT,Tp::HandleTypeContact, handle, yours, handle, false, hints, &error);
     if(error.isValid()) {
         qWarning() << "Error creating channel for incoming message" << error.name() << error.message();
         return;
@@ -901,6 +899,26 @@
     return newHandle(normalizedNumber);
 }
 
+Tp::BaseChannelPtr oFonoConnection::ensureChannel(const QString &channelType, uint targetHandleType,
+        uint targetHandle, bool &yours, uint initiatorHandle,
+        bool suppressHandler,
+        const QVariantMap &hints,
+        Tp::DBusError* error)
+{
+    // we only reuse old text channels
+    if (channelType == TP_QT_IFACE_CHANNEL_TYPE_TEXT) {
+        Q_FOREACH(oFonoTextChannel *channel, mTextChannels) {
+            if (channel->baseChannel()->targetHandleType() == targetHandleType
+                    && channel->baseChannel()->targetHandle() == targetHandle) {
+                yours = false;
+                return channel->baseChannel();
+            }
+        }
+    }
+    yours = true;
+    return Tp::BaseConnection::createChannel(channelType, targetHandleType, targetHandle, initiatorHandle, suppressHandler, hints, error);
+}
+
 void oFonoConnection::onOfonoCallAdded(const QString &call, const QVariantMap &properties)
 {
     qDebug() << "new call" << call << properties;
@@ -908,6 +926,13 @@
     bool yours;
     Tp::DBusError error;
     QString lineIdentification = properties["LineIdentification"].toString();
+
+    // check if there is an open channel for this call, if so, ignore it
+    if (mCallChannels.keys().contains(call)) {
+        qWarning() << "call channel for this object path already exists: " << call;
+        return;
+    }
+
     QString normalizedNumber;
     // TODO check if more than one private/unknown calls are supported at the same time
     if (lineIdentification.isEmpty()) {
@@ -921,13 +946,6 @@
     } else {
         normalizedNumber = PhoneUtils::normalizePhoneNumber(lineIdentification);
     }
-    // check if there is an open channel for this number, if so, ignore it
-    Q_FOREACH(const QString &phoneNumber, mCallChannels.keys()) {
-        if (PhoneUtils::comparePhoneNumbers(normalizedNumber, phoneNumber)) {
-            qWarning() << "call channel for this number already exists: " << phoneNumber;
-            return;
-        }
-    }
 
     uint handle = ensureHandle(normalizedNumber);
     uint initiatorHandle = 0;
@@ -940,7 +958,9 @@
     qDebug() << "initiatorHandle " <<initiatorHandle;
     qDebug() << "handle" << handle;
 
-    Tp::BaseChannelPtr channel  = ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact, handle, yours, initiatorHandle, false, QVariantMap(), &error);
+    QVariantMap hints;
+    hints["ofonoObjPath"] = call;
+    Tp::BaseChannelPtr channel  = ensureChannel(TP_QT_IFACE_CHANNEL_TYPE_CALL, Tp::HandleTypeContact, handle, yours, initiatorHandle, false, hints, &error);
     if (error.isValid() || channel.isNull()) {
         qWarning() << "error creating the channel " << error.name() << error.message();
         return;
 
=== modified file 'connection.h'
--- connection.h	2014-04-03 19:27:12 +0000
+++ connection.h	2014-04-03 19:27:12 +0000
@@ -68,7 +68,7 @@
     QStringList inspectHandles(uint handleType, const Tp::UIntList& handles, Tp::DBusError *error);
     Tp::UIntList requestHandles(uint handleType, const QStringList& identifiers, Tp::DBusError* error);
     Tp::BaseChannelPtr createChannel(const QString& channelType, uint targetHandleType,
-                                     uint targetHandle,  const QVariantMap &hints, Tp::DBusError *error);
+                                     uint targetHandle, const QVariantMap &hints, Tp::DBusError *error);
     Tp::ContactAttributesMap getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error);
     uint setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error);
     void connect(Tp::DBusError *error);
@@ -97,9 +97,15 @@
     uint ensureHandle(const QString &phoneNumber);
     oFonoTextChannel* textChannelForMembers(const QStringList &members);
     Tp::BaseChannelPtr createTextChannel(uint targetHandleType,
-                                         uint targetHandle,  const QVariantMap &hints, Tp::DBusError *error);
+                                         uint targetHandle, const QVariantMap &hints, Tp::DBusError *error);
     Tp::BaseChannelPtr createCallChannel(uint targetHandleType,
-                                         uint targetHandle,  const QVariantMap &hints, Tp::DBusError *error);
+                                         uint targetHandle, const QVariantMap &hints, Tp::DBusError *error);
+    Tp::BaseChannelPtr ensureChannel(const QString &channelType, uint targetHandleType,
+        uint targetHandle, bool &yours, uint initiatorHandle,
+        bool suppressHandler,
+        const QVariantMap &hints,
+        Tp::DBusError* error);
+
 
     ~oFonoConnection();
 
@@ -115,6 +121,7 @@
 
 private Q_SLOTS:
     void onOfonoIncomingMessage(const QString &message, const QVariantMap &info);
+    void onOfonoImmediateMessage(const QString &message, const QVariantMap &info);
     void onOfonoCallAdded(const QString &call, const QVariantMap &properties);
     void onOfonoNetworkRegistrationChanged(const QString &status);
     void onTextChannelClosed();
@@ -138,6 +145,7 @@
 private:
     bool isNetworkRegistered();
     void addMMSToService(const QString &path, const QVariantMap &properties, const QString &servicePath);
+    void ensureTextChannel(const QString &message, const QVariantMap &info, bool flash);
     QMap<uint, QString> mHandles;
 
     QList<oFonoTextChannel*> mTextChannels;
 
=== modified file 'ofonotextchannel.cpp'
--- ofonotextchannel.cpp	2014-02-24 21:12:26 +0000
+++ ofonotextchannel.cpp	2014-04-03 19:27:12 +0000
@@ -39,10 +39,11 @@
     return argument;
 }
 
-oFonoTextChannel::oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, QObject *parent):
+oFonoTextChannel::oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, bool flash, QObject *parent):
     QObject(parent),
     mConnection(conn),
     mPhoneNumbers(phoneNumbers),
+    mFlash(flash),
     mMessageCounter(1)
 {
     qDBusRegisterMetaType<AttachmentStruct>();
@@ -87,6 +88,9 @@
     baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mGroupIface));
     addMembers(phoneNumbers);
 
+    mSMSIface = Tp::BaseChannelSMSInterface::create(flash, true);
+    baseChannel->plugInterface(Tp::AbstractChannelInterfacePtr::dynamicCast(mSMSIface));
+
     mBaseChannel = baseChannel;
     mTextChannel = Tp::BaseChannelTextTypePtr::dynamicCast(mBaseChannel->interface(TP_QT_IFACE_CHANNEL_TYPE_TEXT));
     mTextChannel->setMessageAcknowledgedCallback(Tp::memFun(this,&oFonoTextChannel::messageAcknowledged));
 
=== modified file 'ofonotextchannel.h'
--- ofonotextchannel.h	2014-02-18 21:09:03 +0000
+++ ofonotextchannel.h	2014-04-03 19:27:12 +0000
@@ -34,7 +34,7 @@
 {
     Q_OBJECT
 public:
-    oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, QObject *parent = 0);
+    oFonoTextChannel(oFonoConnection *conn, QStringList phoneNumbers, bool flash = false, QObject *parent = 0);
     QString sendMessage(const Tp::MessagePartList& message, uint flags, Tp::DBusError* error);
     void messageReceived(const QString & message, uint handle, const QVariantMap &info);
     Tp::BaseChannelPtr baseChannel();
@@ -61,11 +61,13 @@
     oFonoConnection *mConnection;
     Tp::BaseChannelMessagesInterfacePtr mMessagesIface;
     Tp::BaseChannelGroupInterfacePtr mGroupIface;
+    Tp::BaseChannelSMSInterfacePtr mSMSIface;
     Tp::BaseChannelTextTypePtr mTextChannel;
     uint mMessageCounter;
     QMap<QString, uint> mPendingDeliveryReportFailed;
     QMap<QString, uint> mPendingDeliveryReportDelivered;
     Tp::UIntList mMembers;
+    bool mFlash;
 };
 
 #endif // OFONOTEXTCHANNEL_H