Merge lp:~boiko/telephony-service/rtm-dont_crash_no_dbus into lp:telephony-service/rtm-14.09

[Gustavo Pichorim Boiko]

Do not crash if the account manager preparation job does not succeed.

Do not crash if the account manager preparation job does not succeed.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
No

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/<package-name>) on device or emulator?
Yes

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

If you changed UI labels, did you update the pot file?
N/A

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

[lp:~boiko/telephony-service/rtm-dont_crash_no_dbus]

908. By Gustavo Pichorim Boiko on 2014-11-05

Do not try to connect signals of an observer that didn't get registered.

[Bill Filler (bfiller)]

approve

review: Approve

=== modified file 'libtelephonyservice/telepathyhelper.cpp'
--- libtelephonyservice/telepathyhelper.cpp	2014-10-04 02:23:07 +0000
+++ libtelephonyservice/telepathyhelper.cpp	2014-11-05 20:43:30 +0000
@@ -201,17 +201,17 @@
     }
 
     mChannelObserver = new ChannelObserver(this);
-    registerClient(mChannelObserver, name);
-
-    // messages
-    connect(mChannelObserver, SIGNAL(textChannelAvailable(Tp::TextChannelPtr)),
-            ChatManager::instance(), SLOT(onTextChannelAvailable(Tp::TextChannelPtr)));
-
-    // calls
-    connect(mChannelObserver, SIGNAL(callChannelAvailable(Tp::CallChannelPtr)),
-            CallManager::instance(), SLOT(onCallChannelAvailable(Tp::CallChannelPtr)));
-
-    Q_EMIT channelObserverCreated(mChannelObserver);
+    if (registerClient(mChannelObserver, name)) {
+        // messages
+        connect(mChannelObserver, SIGNAL(textChannelAvailable(Tp::TextChannelPtr)),
+                ChatManager::instance(), SLOT(onTextChannelAvailable(Tp::TextChannelPtr)));
+
+        // calls
+        connect(mChannelObserver, SIGNAL(callChannelAvailable(Tp::CallChannelPtr)),
+                CallManager::instance(), SLOT(onCallChannelAvailable(Tp::CallChannelPtr)));
+
+        Q_EMIT channelObserverCreated(mChannelObserver);
+    }
 }
 
 void TelepathyHelper::unregisterChannelObserver()
@@ -245,7 +245,7 @@
             SLOT(onAccountReady()));
 }
 
-void TelepathyHelper::registerClient(Tp::AbstractClient *client, QString name)
+bool TelepathyHelper::registerClient(Tp::AbstractClient *client, QString name)
 {
     Tp::AbstractClientPtr clientPtr(client);
     bool succeeded = mClientRegistrar->registerClient(clientPtr, name);
@@ -267,6 +267,8 @@
             object->setProperty("clientName", TP_QT_IFACE_CLIENT + "." + name );
         }
     }
+
+    return succeeded;
 }
 
 AccountEntry *TelepathyHelper::accountForConnection(const Tp::ConnectionPtr &connection) const
@@ -329,7 +331,11 @@
 
 void TelepathyHelper::onAccountManagerReady(Tp::PendingOperation *op)
 {
-    Q_UNUSED(op)
+    // if the account manager ready job returns an error, just fail silently
+    if (op->isError()) {
+        qCritical() << "Failed to prepare Tp::AccountManager" << op->errorName() << op->errorMessage();
+        return;
+    }
 
     Tp::AccountSetPtr accountSet;
     QMap<QString, AccountEntry *> orderedAccounts;

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2014-09-29 23:09:25 +0000
+++ libtelephonyservice/telepathyhelper.h	2014-11-05 20:43:30 +0000
@@ -80,7 +80,7 @@
     bool emergencyCallsAvailable() const;
     Q_INVOKABLE void unlockSimCards() const;
 
-    void registerClient(Tp::AbstractClient *client, QString name);
+    bool registerClient(Tp::AbstractClient *client, QString name);
 
     // pre-populated channel class specs for conferences
     static Tp::ChannelClassSpec audioConferenceSpec();