Merge lp:~tiagosh/telephony-service/sim-lock into lp:telephony-service

[Tiago Salem Herrmann]

Add simLocked() property to AccountEntry.

Add simLocked() property to AccountEntry.

--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~tiagosh/telepathy-ofono/sim-lock/+merge/235506

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.

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/sim-lock]

943. By Tiago Salem Herrmann on 2014-09-24

use status() instead of statusMessage()

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/sim-lock]

944. By Tiago Salem Herrmann on 2014-09-25

add method to invoke the dialog to unlock sim cards

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/sim-lock]

945. By Tiago Salem Herrmann on 2014-09-25

fix return type

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~tiagosh/telephony-service/sim-lock]

946. By Tiago Salem Herrmann on 2014-09-29

ad failed messages to the history-service and notify users
about the failure

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/315/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

[lp:~tiagosh/telephony-service/sim-lock]

947. By Tiago Salem Herrmann on 2014-10-07

prevent empty accountId's

948. By Tiago Salem Herrmann on 2014-10-07

use cancel icon

=== modified file 'indicator/textchannelobserver.cpp'
--- indicator/textchannelobserver.cpp	2014-09-17 20:17:39 +0000
+++ indicator/textchannelobserver.cpp	2014-10-07 16:32:37 +0000
@@ -58,6 +58,7 @@
     QString eventId;
     QString alias;
     QString message;
+    TextChannelObserver *observer;
     QMap<NotifyNotification*, NotificationData*> *notificationList;
 };
 
@@ -70,7 +71,7 @@
     qDebug() << accountId << data;
     NotificationData *notificationData = (NotificationData*) data;
     if (notificationData != NULL) {
-        ChatManager::instance()->sendMessage(QStringList() << notificationData->phoneNumber, notificationData->text, accountId);
+        notificationData->observer->sendMessage(QStringList() << notificationData->phoneNumber, notificationData->text, accountId);
     }
 
     notify_notification_close(notification, &error);
@@ -161,6 +162,91 @@
     mNotifications.clear();
 }
 
+void TextChannelObserver::sendMessage(const QStringList &phoneNumbers, const QString &text, const QString &accountId)
+{
+    AccountEntry *account = TelepathyHelper::instance()->accountForId(accountId);
+    if (!account || accountId.isEmpty()) {
+        // fallback to the default account
+        if (TelepathyHelper::instance()->defaultMessagingAccount() && TelepathyHelper::instance()->accounts().size() > 1) {
+            account = TelepathyHelper::instance()->defaultMessagingAccount();
+        } else if (TelepathyHelper::instance()->accounts().size() > 0) {
+            account = TelepathyHelper::instance()->accounts()[0];
+        }
+    }
+
+    if (!account) {
+        // we could not find any account, but in theory this case can never happen
+        return;
+    }
+
+    // check if the account is available
+    if (!account->connected()) {
+        History::Thread thread = History::Manager::instance()->threadForParticipants(account->accountId(),
+                                                                                     History::EventTypeText,
+                                                                                     phoneNumbers,
+                                                                                     History::MatchPhoneNumber,
+                                                                                     true);
+        History::TextEvent textEvent(account->accountId(),
+                                     thread.threadId(),
+                                     QByteArray(QDateTime::currentDateTime().toString("yyyy-MM-ddTHH:mm:ss.zzz").toUtf8()).toHex(),
+                                     "self",
+                                     QDateTime::currentDateTime(),
+                                     false,
+                                     text,
+                                     History::MessageTypeText,
+                                     History::MessageStatusPermanentlyFailed);
+        History::Events events;
+        events.append(textEvent);
+                                 
+        History::Manager::instance()->writeEvents(events);
+
+        QString failureMessage;
+        if (account->simLocked()) {
+            failureMessage = C::gettext("Unlock your sim card and try again from the messaging application.");
+        } else if (TelepathyHelper::instance()->flightMode()) {
+            failureMessage = C::gettext("Deactivate flight mode and try again from the messaging application.");
+        } else {
+            // generic error
+            failureMessage = C::gettext("Try again from the messaging application.");
+        }
+
+        // notify user about the failure
+        GIcon *icon = g_themed_icon_new("cancel");
+        NotifyNotification *notification = notify_notification_new(C::gettext("The message could not be sent"),
+                                                               failureMessage.toStdString().c_str(),
+                                                               g_icon_to_string(icon));
+        NotificationData *data = new NotificationData();
+        data->phoneNumber = phoneNumbers[0];
+        data->message = text;
+        data->notificationList = &mNotifications;
+        mNotifications.insert(notification, data);
+
+        // add the callback action
+        notify_notification_add_action (notification,
+                                        "notification_action",
+                                        C::gettext("View message"),
+                                        notification_action,
+                                        data,
+                                        NULL /* will be deleted when closed */);
+
+        notify_notification_set_hint_string(notification,
+                                            "x-canonical-switch-to-application",
+                                            "true");
+
+        g_signal_connect(notification, "closed", G_CALLBACK(notification_closed), &mNotifications);
+
+        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(phoneNumbers, text, accountId);
+}
+
 void TextChannelObserver::showNotificationForFlashMessage(const Tp::ReceivedMessage &message)
 {
     Tp::ContactPtr contact = message.sender();
@@ -420,6 +506,7 @@
         NotificationData *data = new NotificationData();
         data->phoneNumber = phoneNumber;
         data->text = reply;
+        data->observer = this;
         mNotifications.insert(notification, data);
 
         Q_FOREACH(AccountEntry *account, TelepathyHelper::instance()->accounts()) {
@@ -444,7 +531,7 @@
         return;
     }
 
-    ChatManager::instance()->sendMessage(QStringList() << phoneNumber, reply);
+    sendMessage(QStringList() << phoneNumber, reply, "");
 }
 
 void TextChannelObserver::onMessageRead(const QString &phoneNumber, const QString &encodedMessageId)

=== modified file 'indicator/textchannelobserver.h'
--- indicator/textchannelobserver.h	2014-09-17 19:32:38 +0000
+++ indicator/textchannelobserver.h	2014-10-07 16:32:37 +0000
@@ -39,6 +39,7 @@
 
 public Q_SLOTS:
     void onTextChannelAvailable(Tp::TextChannelPtr textChannel);
+    void sendMessage(const QStringList &phoneNumbers, const QString &text, const QString &accountId);
 
 protected:
     void showNotificationForMessage(const Tp::ReceivedMessage &message);

=== modified file 'libtelephonyservice/accountentry.cpp'
--- libtelephonyservice/accountentry.cpp	2014-09-16 15:35:04 +0000
+++ libtelephonyservice/accountentry.cpp	2014-10-07 16:32:37 +0000
@@ -55,11 +55,20 @@
     }
     Tp::Presence presence = mAccount->connection()->selfContact()->presence();
     if (presence.type() == Tp::ConnectionPresenceTypeAvailable) {
-        return mAccount->connection()->selfContact()->presence().statusMessage();
+        return presence.statusMessage();
     }
     return QString::null;
 }
 
+bool AccountEntry::simLocked() const
+{
+    if (mAccount.isNull() || mAccount->connection().isNull() || mAccount->connection()->selfContact().isNull()) {
+        return false;
+    }
+    Tp::Presence presence = mAccount->connection()->selfContact()->presence();
+    return (presence.type() == Tp::ConnectionPresenceTypeAway && presence.status() == "simlocked");
+}
+
 void AccountEntry::setDisplayName(const QString &name)
 {
     if (mAccount.isNull()) {
@@ -165,6 +174,10 @@
     connect(mAccount->connection()->selfContact().data(),
             SIGNAL(presenceChanged(Tp::Presence)),
             SIGNAL(networkNameChanged()));
+
+    connect(mAccount->connection()->selfContact().data(),
+            SIGNAL(presenceChanged(Tp::Presence)),
+            SIGNAL(simLockedChanged()));
 }
 
 void AccountEntry::onConnectionChanged()
@@ -236,6 +249,7 @@
 
     Q_EMIT networkNameChanged();
     Q_EMIT connectedChanged();
+    Q_EMIT simLockedChanged();
 }
 
 void AccountEntry::onEmergencyNumbersChanged(const QStringList &numbers)

=== modified file 'libtelephonyservice/accountentry.h'
--- libtelephonyservice/accountentry.h	2014-09-16 10:45:43 +0000
+++ libtelephonyservice/accountentry.h	2014-10-07 16:32:37 +0000
@@ -42,12 +42,14 @@
     Q_PROPERTY(uint voicemailCount READ voicemailCount NOTIFY voicemailCountChanged)
     Q_PROPERTY(bool voicemailIndicator READ voicemailIndicator NOTIFY voicemailIndicatorChanged)
     Q_PROPERTY(QString networkName READ networkName NOTIFY networkNameChanged)
+    Q_PROPERTY(bool simLocked READ simLocked NOTIFY simLockedChanged)
 
 public:
     explicit AccountEntry(const Tp::AccountPtr &account, QObject *parent = 0);
     QString accountId() const;
     QString displayName() const;
     QString networkName() const;
+    bool simLocked() const;
     void setDisplayName(const QString &name);
     bool connected() const;
     QStringList emergencyNumbers() const;
@@ -61,6 +63,7 @@
     void accountIdChanged();
     void displayNameChanged();
     void networkNameChanged();
+    void simLockedChanged();
     void connectedChanged();
     void emergencyNumbersChanged();
     void voicemailNumberChanged();

=== modified file 'libtelephonyservice/chatmanager.cpp'
--- libtelephonyservice/chatmanager.cpp	2014-09-11 18:12:50 +0000
+++ libtelephonyservice/chatmanager.cpp	2014-10-07 16:32:37 +0000
@@ -115,7 +115,7 @@
 void ChatManager::sendMessage(const QStringList &phoneNumbers, const QString &message, const QString &accountId)
 {
     AccountEntry *account;
-    if (accountId.isNull()) {
+    if (accountId.isNull() || accountId.isEmpty()) {
         account = TelepathyHelper::instance()->defaultMessagingAccount();
         if (!account) {
             account = TelepathyHelper::instance()->accounts()[0];
@@ -124,6 +124,10 @@
         account = TelepathyHelper::instance()->accountForId(accountId);
     }
 
+    if (!account) {
+        return;
+    }
+
     QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
     phoneAppHandler->call("SendMessage", phoneNumbers, message, account->accountId());
 }

=== modified file 'libtelephonyservice/telepathyhelper.cpp'
--- libtelephonyservice/telepathyhelper.cpp	2014-08-15 21:16:57 +0000
+++ libtelephonyservice/telepathyhelper.cpp	2014-10-07 16:32:37 +0000
@@ -454,3 +454,11 @@
     }
 }
 
+void TelepathyHelper::unlockSimCards() const
+{
+    QDBusInterface connectivityIface("com.ubuntu.connectivity1",
+                                    "/com/ubuntu/connectivity1/Private",
+                                    "com.ubuntu.connectivity1.Private");
+    connectivityIface.asyncCall("UnlockAllModems");
+}
+

=== modified file 'libtelephonyservice/telepathyhelper.h'
--- libtelephonyservice/telepathyhelper.h	2014-08-22 19:01:46 +0000
+++ libtelephonyservice/telepathyhelper.h	2014-10-07 16:32:37 +0000
@@ -75,6 +75,7 @@
     AccountEntry *accountForConnection(const Tp::ConnectionPtr &connection) const;
     Q_INVOKABLE AccountEntry *accountForId(const QString &accountId) const;
     Q_INVOKABLE void setDefaultAccount(AccountType type, AccountEntry* account);
+    Q_INVOKABLE void unlockSimCards() const;
 
     void registerClient(Tp::AbstractClient *client, QString name);