Merge lp:~tiagosh/telephony-service/fallback-default-account into lp:telephony-service

[Tiago Salem Herrmann]

- Fix crash on the desktop
- Use default account for messaging as a fallback
- Display a dialog asking the user to choose a sim card when sending a message from messaging-menu and no default sim card is defined.

- Fix crash on the desktop
- Use default account for messaging as a fallback
- Display a dialog asking the user to choose a sim card when sending a message from messaging-menu and no default sim card is defined.

--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/telephony-service) 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?
will be done later to avoid conflicts

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

[lp:~tiagosh/telephony-service/fallback-default-account]

935. By Tiago Salem Herrmann on 2014-09-11

add fixme

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:935
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/306/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/122
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-armhf-ci/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-utopic-i386-ci/123

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

review: Approve (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.
Yes

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 'handler/texthandler.cpp'
--- handler/texthandler.cpp	2014-07-28 21:05:28 +0000
+++ handler/texthandler.cpp	2014-09-11 20:58:09 +0000
@@ -254,6 +254,9 @@
 void TextHandler::onTextChannelAvailable(Tp::TextChannelPtr channel)
 {
     AccountEntry *account = TelepathyHelper::instance()->accountForConnection(channel->connection());
+    if (!account) {
+        return;
+    }
     QString accountId = account->accountId();
     mChannels.append(channel);
 

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2014-07-07 22:01:09 +0000
+++ indicator/textchannelobserver.cpp	2014-09-11 20:58:09 +0000
@@ -30,6 +30,7 @@
 #include "ringtone.h"
 #include "telepathyhelper.h"
 #include "phoneutils.h"
+#include "accountentry.h"
 #include <TelepathyQt/AvatarData>
 #include <TelepathyQt/TextChannel>
 #include <TelepathyQt/ReceivedMessage>
@@ -62,6 +63,20 @@
 
 void notification_closed(NotifyNotification *notification, QMap<NotifyNotification*, NotificationData*> *map);
 
+void sim_selection_action(NotifyNotification* notification, char *action, gpointer data)
+{
+    GError *error = NULL;
+    QString accountId = action;
+    qDebug() << accountId << data;
+    NotificationData *notificationData = (NotificationData*) data;
+    if (notificationData != NULL) {
+        ChatManager::instance()->sendMessage(QStringList() << notificationData->phoneNumber, notificationData->text, accountId);
+    }
+
+    notify_notification_close(notification, &error);
+    g_object_unref(notification);
+}
+
 void flash_notification_action(NotifyNotification* notification, char *action, gpointer data)
 {
     GError *error = NULL;
@@ -379,6 +394,38 @@
 
 void TextChannelObserver::onReplyReceived(const QString &phoneNumber, const QString &reply)
 {
+    // FIXME - we need to find a better way to deal with dual sim in the messaging-menu
+    if (!TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->accounts().size() > 1) {
+        NotifyNotification *notification = notify_notification_new(C::gettext("Please, select a SIM card:"),
+                                                                   reply.toStdString().c_str(),
+                                                                   "");
+        NotificationData *data = new NotificationData();
+        data->phoneNumber = phoneNumber;
+        data->text = reply;
+        mNotifications.insert(notification, data);
+
+        Q_FOREACH(AccountEntry *account, TelepathyHelper::instance()->accounts()) {
+            notify_notification_add_action (notification,
+                                            account->accountId().toStdString().c_str(),
+                                            account->displayName().toStdString().c_str(),
+                                            sim_selection_action,
+                                            data,
+                                            NULL);
+        }
+        g_signal_connect(notification, "closed", G_CALLBACK(notification_closed), &mNotifications);
+
+        notify_notification_set_hint_string(notification,
+                                            "x-canonical-snap-decisions",
+                                            "true");
+
+        GError *error = NULL;
+        if (!notify_notification_show(notification, &error)) {
+            qWarning() << "Failed to show message notification:" << error->message;
+            g_error_free (error);
+        }
+        return;
+    }
+
     ChatManager::instance()->sendMessage(QStringList() << phoneNumber, reply);
 }
 

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2014-08-07 12:18:15 +0000
+++ libtelephonyservice/callmanager.cpp	2014-09-11 20:58:09 +0000
@@ -24,6 +24,7 @@
 #include "callentry.h"
 #include "telepathyhelper.h"
 #include "greetercontacts.h"
+#include "accountentry.h"
 
 #include <TelepathyQt/ContactManager>
 #include <TelepathyQt/PendingContacts>
@@ -165,13 +166,22 @@
 
 void CallManager::startCall(const QString &phoneNumber, const QString &accountId)
 {
-    QString account = accountId;
-    if (account.isNull()) {
-        account = TelepathyHelper::instance()->accountIds()[0];
+    AccountEntry *account;
+    if (accountId.isNull()) {
+        account = TelepathyHelper::instance()->defaultCallAccount();
+        if (!account) {
+            account = TelepathyHelper::instance()->accounts()[0];
+        }
+    } else {
+        account = TelepathyHelper::instance()->accountForId(accountId);
+    }
+
+    if (!account) {
+        return;
     }
 
     QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
-    phoneAppHandler->call("StartCall", phoneNumber, account);
+    phoneAppHandler->call("StartCall", phoneNumber, account->accountId());
 }
 
 void CallManager::onCallIndicatorVisibleChanged(bool visible)

=== modified file 'libtelephonyservice/chatmanager.cpp'
--- libtelephonyservice/chatmanager.cpp	2014-07-28 21:05:28 +0000
+++ libtelephonyservice/chatmanager.cpp	2014-09-11 20:58:09 +0000
@@ -75,7 +75,10 @@
     AttachmentList newAttachments;
     AccountEntry *account;
     if (accountId.isNull()) {
-        account = TelepathyHelper::instance()->accounts()[0];
+        account = TelepathyHelper::instance()->defaultMessagingAccount();
+        if (!account) {
+            account = TelepathyHelper::instance()->accounts()[0];
+        }
     } else {
         account = TelepathyHelper::instance()->accountForId(accountId);
     }
@@ -113,7 +116,10 @@
 {
     AccountEntry *account;
     if (accountId.isNull()) {
-        account = TelepathyHelper::instance()->accounts()[0];
+        account = TelepathyHelper::instance()->defaultMessagingAccount();
+        if (!account) {
+            account = TelepathyHelper::instance()->accounts()[0];
+        }
     } else {
         account = TelepathyHelper::instance()->accountForId(accountId);
     }