Merge lp:~unity-api-team/indicator-network/dual_sim_pin_unlock into lp:indicator-network/14.10

[Antti Kaijanmäki]

Finish the dual sim unlocking.

(LP: #1267135)
(LP: #1302050)
(LP: #1303633)
(LP: #1303635)
(LP: #1303680)
(LP: #1315451)
(LP: #1336675)
(LP: #1357000)
(LP: #1359226)
(LP: #1359276)
(LP: #1359280)
(LP: #1360343)
(LP: #1361074)

finish the dual sim unlocking.

needs to land together with:
https://code.launchpad.net/~unity-api-team/unity8/dual_sim_pin_unlock/+merge/232672

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/188/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/62/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/188/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

419. By Antti Kaijanmäki on 2014-10-07

whoops..

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:419
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/63/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/189/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

* There seems to be an issue with the parameters somewhere: I got this after opening the SIM unlock screen: http://i.imgur.com/2IgtkJs.png

* The joining of strings doesn't seem to work properly: http://imgur.com/IQfD4gg
IIRC the first sentence should be in the title, and the others need to be joined adding a whitespace.

* I locked my SIM, then I entered the PUK, it asked me for my new PIN, I entered that. The card however is still blocked and still asks for the PUK.

* indicator-network crashes randomly. Sometimes when I entered the puk, sometimes when clicking the unlock sim card button in the indicator dropdown.

* Entering the PUK, it keeps on saying "10 retries left", never decreases the 10. Might be related to it crashing and not really trying to set the puk.

I'm not able to unlock a PUK-locked sim card.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

Is the PUK defined to always be 8 characters? Can it be longer?

[Antti Kaijanmäki (kaijanmaki)]

> Is the PUK defined to always be 8 characters? Can it be longer?

it's _always_ 8 by international specs.

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

420. By Antti Kaijanmäki on 2014-10-07

add spaces between dialog sentences.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:420
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/191/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/65/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/191/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

421. By Antti Kaijanmäki on 2014-10-07

Fix enter pin string.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:421
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/66
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/66/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/192/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

422. By Antti Kaijanmäki on 2014-10-07

fix pin reset with puk code and random crash with the ubuntu:i18n.

[Michael Zanetti (mzanetti)]

Working well now for me. But I only tested it, no code review.

review: Approve (manual test)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:422
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/67
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/67/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/193/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Mostly looks good, some questions inline

review: Needs Information

[Antti Kaijanmäki (kaijanmaki)]

answers inline.

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

423. By Antti Kaijanmäki on 2014-10-07

don't call closed() on a unlock dialog popup too early.

[Charles Kerr (charlesk)]

review: Approve

[lp:~unity-api-team/indicator-network/dual_sim_pin_unlock]

424. By Antti Kaijanmäki on 2014-10-07

fix popups for puk.

425. By Antti Kaijanmäki on 2014-10-07

update pot again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:423
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/194/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/68
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/68
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/68/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/194/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:425
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/195/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/69/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/195/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Hmm... The UnlockAllModems D-Bus call doesn't seem to work properly any more... It does open the dialog once, but entering the PIN there doesn't actually unlock the modem. All subsequent calls of this method time out.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Hmm... The UnlockAllModems D-Bus call doesn't seem to work properly any
> more... It does open the dialog once, but entering the PIN there doesn't
> actually unlock the modem. All subsequent calls of this method time out.

Seems this is out of scope of this branch...

review: Abstain

[Antti Kaijanmäki (kaijanmaki)]

> > Hmm... The UnlockAllModems D-Bus call doesn't seem to work properly any
> > more... It does open the dialog once, but entering the PIN there doesn't
> > actually unlock the modem. All subsequent calls of this method time out.
>
> Seems this is out of scope of this branch...

Fixing UnlockAllModems is not part of this MP anymore.
Separately tracked in:
https://bugs.launchpad.net/ubuntu-rtm/+source/indicator-network/+bug/1333121

[Olga Kemmet (olga-kemmet)]

Works as intended.

review: Approve (design)

=== modified file 'po/indicator-network.pot'
--- po/indicator-network.pot	2014-08-08 12:36:47 +0000
+++ po/indicator-network.pot	2014-10-07 17:43:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: indicator-network\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-08 15:33+0300\n"
+"POT-Creation-Date: 2014-10-07 20:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,153 +16,193 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: network/quick-access-section.cpp:48
+#: src/indicator/quick-access-section.cpp:48
 msgid "Flight Mode"
 msgstr ""
 
 #. TRANSLATORS: this is the indicator title shown on the top header of the indicator area
-#: network/root-state.cpp:307
+#: src/indicator/root-state.cpp:296
 msgid "Network"
 msgstr ""
 
-#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-#: network/sim-unlock-dialog.cpp:85
-msgid ""
-"This will be the last attempt.<br><br>If the SIM PIN is entered incorrectly, "
-"your SIM will be blocked and would require the PUK Code to unlock."
-msgstr ""
-
-#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-#: network/sim-unlock-dialog.cpp:95
-msgid ""
-"Your SIM is now blocked.<br><br>Enter the PUK Code to unlock.<br><br>You may "
-"contact your network provider for PUK Code."
-msgstr ""
-
-#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-#: network/sim-unlock-dialog.cpp:106
-msgid ""
-"This will be the last attempt.<br><br>If the PUK code is entered "
-"incorrectly, your SIM will need to be replaced.<br><br>Please contact your "
-"network provider."
-msgstr ""
-
-#. TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-#: network/sim-unlock-dialog.cpp:117
-msgid ""
-"Your SIM is now permanently blocked and needs to be replaced.<br><br>Please "
-"contact your network provider."
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:183 network/sim-unlock-dialog.cpp:414
-#: network/sim-unlock-dialog.cpp:442
-msgid "Enter SIM PIN"
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:187
+#: src/indicator/sim-unlock-dialog.cpp:115
+msgid "Sorry, incorrect PIN"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:136
+msgid "Sorry, incorrect PUK"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:151
+msgid "Sorry, incorrect %{1} PIN."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:156
+#: src/indicator/sim-unlock-dialog.cpp:185
+msgid "This will be your last attempt."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:158
+msgid ""
+"If %{1} PIN is entered incorrectly you will require your PUK code to unlock."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:168
+msgid "Sorry, your %{1} is now blocked."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:173
+msgid "Please enter your PUK code to unblock SIM card."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:175
+msgid "You may need to contact your network provider for PUK code."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:183
+#: src/indicator/sim-unlock-dialog.cpp:197
+msgid "Sorry, incorrect PUK."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:187
+msgid ""
+"If PUK code is entered incorrectly, your SIM card will be blocked and needs "
+"replacement."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:189
+msgid "Please contact your network provider."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:199
+msgid "Your SIM card is now permanently blocked and needs replacement."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:201
+msgid "Please contact your service provider."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:265
+msgid "Enter %{1} PIN"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:272
 msgid "Enter PUK code"
 msgstr ""
 
-#: network/sim-unlock-dialog.cpp:195
+#: src/indicator/sim-unlock-dialog.cpp:274
+msgid "Enter PUK code for %{1}"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:282
 #, c-format
-msgid "Attempt %d of %d"
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:210 network/sim-unlock-dialog.cpp:425
-#: network/sim-unlock-dialog.cpp:435
+msgid "1 attempt remaining"
+msgid_plural "%d attempts remaining"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/indicator/sim-unlock-dialog.cpp:293
+msgid "Enter new %{1} PIN"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:301
+msgid "Confirm new %{1} PIN"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:340
+#: src/indicator/sim-unlock-dialog.cpp:515
+msgid "PIN codes did not match."
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:495
+#: src/indicator/sim-unlock-dialog.cpp:523
+msgid "Enter SIM PIN"
+msgstr ""
+
+#: src/indicator/sim-unlock-dialog.cpp:506
+#: src/indicator/sim-unlock-dialog.cpp:516
 msgid "Enter new PIN code"
 msgstr ""
 
-#: network/sim-unlock-dialog.cpp:213 network/sim-unlock-dialog.cpp:429
+#: src/indicator/sim-unlock-dialog.cpp:510
 msgid "Confirm new PIN code"
 msgstr ""
 
-#: network/sim-unlock-dialog.cpp:236
-msgid "Oops!<br>Incorrect PIN entered."
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:254 network/sim-unlock-dialog.cpp:434
-msgid "PIN codes did not match."
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:259
-msgid "Oops!<br>Incorrect PUK entered."
-msgstr ""
-
-#: network/sim-unlock-dialog.cpp:441
+#: src/indicator/sim-unlock-dialog.cpp:522
 msgid "Failed to change PIN."
 msgstr ""
 
-#: network/wifi-link-item.h:87
+#: src/indicator/wifi-link-item.h:88
 msgid "Wi-Fi"
 msgstr ""
 
-#: network/wifi-link-item.h:151
+#: src/indicator/wifi-link-item.h:152
 msgid "Other network…"
 msgstr ""
 
-#: network/wifi-section.cpp:60
+#: src/indicator/wifi-section.cpp:60
 msgid "Wi-Fi settings…"
 msgstr ""
 
-#: network/wwan-link-item.cpp:87
+#: src/indicator/wwan-link-item.cpp:87
 msgid "No SIM"
 msgstr ""
 
-#: network/wwan-link-item.cpp:93
+#: src/indicator/wwan-link-item.cpp:93
 msgid "SIM Error"
 msgstr ""
 
-#: network/wwan-link-item.cpp:100
+#: src/indicator/wwan-link-item.cpp:100
 msgid "SIM Locked"
 msgstr ""
 
-#: network/wwan-link-item.cpp:112
+#: src/indicator/wwan-link-item.cpp:112
 msgid "Unregistered"
 msgstr ""
 
-#: network/wwan-link-item.cpp:116
+#: src/indicator/wwan-link-item.cpp:116
 msgid "Unknown"
 msgstr ""
 
-#: network/wwan-link-item.cpp:120
+#: src/indicator/wwan-link-item.cpp:120
 msgid "Denied"
 msgstr ""
 
-#: network/wwan-link-item.cpp:124
+#: src/indicator/wwan-link-item.cpp:124
 msgid "Searching"
 msgstr ""
 
-#: network/wwan-link-item.cpp:135
+#: src/indicator/wwan-link-item.cpp:135
 msgid "No Signal"
 msgstr ""
 
-#: network/wwan-link-item.cpp:141
+#: src/indicator/wwan-link-item.cpp:141
 msgid "Offline"
 msgstr ""
 
-#: network/wwan-section.cpp:79
+#: src/indicator/wwan-section.cpp:79
 msgid "Cellular settings…"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:62
+#: src/secret-agent/SecretRequest.cpp:62
 #, qt-format
 msgid "Connect to “%1”"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:67
+#: src/secret-agent/SecretRequest.cpp:67
 msgid "WPA"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:69
+#: src/secret-agent/SecretRequest.cpp:69
 msgid "WEP"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:75
+#: src/secret-agent/SecretRequest.cpp:75
 msgid "Connect"
 msgstr ""
 
-#: secret-agent/SecretRequest.cpp:76
+#: src/secret-agent/SecretRequest.cpp:76
 msgid "Cancel"
 msgstr ""

=== modified file 'src/indicator/modem-manager.cpp'
--- src/indicator/modem-manager.cpp	2014-08-28 12:13:29 +0000
+++ src/indicator/modem-manager.cpp	2014-10-07 17:43:18 +0000
@@ -160,6 +160,8 @@
             currentModems.insert(std::make_shared<Modem>(ofonoModem));
         }
 
+
+        m_unlockDialog->showSimIdentifiers().set(currentModems.size() > 1);
         m_modems.set(currentModems);
     }
 
@@ -177,14 +179,11 @@
 
 ModemManager::ModemManager()
 {
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
     d.reset(new Private);
 }
 
 ModemManager::~ModemManager()
-{
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
-}
+{}
 
 void
 ModemManager::unlockModem(Modem::Ptr modem)

=== modified file 'src/indicator/modem.cpp'
--- src/indicator/modem.cpp	2014-10-06 07:52:34 +0000
+++ src/indicator/modem.cpp	2014-10-07 17:43:18 +0000
@@ -211,8 +211,8 @@
     switch(type) {
     case PinType::none:
         return true;
-    case PinType::pin:
-        return d->m_ofonoModem->simManager.get()->resetPin(org::ofono::Interface::SimManager::PinType::pin,
+    case PinType::puk:
+        return d->m_ofonoModem->simManager.get()->resetPin(org::ofono::Interface::SimManager::PinType::puk,
                                                            puk,
                                                            pin);
     default:

=== modified file 'src/indicator/sim-unlock-dialog.cpp'
--- src/indicator/sim-unlock-dialog.cpp	2014-08-14 23:23:06 +0000
+++ src/indicator/sim-unlock-dialog.cpp	2014-10-07 17:43:18 +0000
@@ -24,6 +24,46 @@
 
 #include <functional>
 
+namespace ubuntu {
+namespace i18n{
+
+std::string __argumentSubstitute(int /*depth*/, const std::string &format) // base function
+{
+    return format;
+}
+
+template<typename T, typename... Targs>
+std::string __argumentSubstitute(int depth, const std::string &format, T value, Targs... Fargs)
+{
+    std::string tmp = __argumentSubstitute(depth+1, format, Fargs...);
+    std::string subs = "%{" + std::to_string(depth) + "}";
+
+    const std::string val {value};
+    for (auto it = std::search(tmp.begin(), tmp.end(), subs.begin(), subs.end());
+         it != tmp.end();
+         it = std::search(tmp.begin(), tmp.end(), subs.begin(), subs.end()))
+    {
+        auto pos = it;
+        pos = tmp.erase(pos, pos+subs.length());
+        tmp.insert(pos, val.begin(), val.end());
+    }
+    return tmp;
+}
+
+/// substitute variables in strings by index
+/// only accepts std::string as input for now
+/// argumentSubstitute("First: %{1}, Second %{2}", std::string{"foo"}, std::string{"bar"});
+///     --> "First: foo, Second bar"
+/// argumentSubstitute("First: %{2}, Second %{1}", std::string{"foo"}, std::string{"bar"});
+///     --> "First: bar, Second: foor"
+template<typename... Targs>
+std::string argumentSubstitute(const std::string &format, Targs... Fargs)
+{
+    return __argumentSubstitute(1, format, Fargs...);
+}
+}
+}
+
 class SimUnlockDialog::Private
 {
 public:
@@ -58,7 +98,9 @@
 
     std::vector<core::Connection> m_connections;
 
-    void sendEnterPin(std::string pin)
+    core::Property<bool> m_showSimIdentifiers;
+
+    bool sendEnterPin(std::string pin)
     {
         int retries = -1;
         auto retriesMap = m_modem->retries().get();
@@ -67,17 +109,21 @@
             retries = retriesMap[Modem::PinType::pin];
         }
 
-        if (!m_modem->enterPin(Modem::PinType::pin, pin)) {
-            --retries;
-            if (retries == 1) {
-                showLastPinAttemptPopup();
-            } else if (retries == 0) {
-                showPinBlockedPopup();
-            }
+        if (m_modem->enterPin(Modem::PinType::pin, pin))
+            return true;
+
+        m_sd->showError(_("Sorry, incorrect PIN"));
+        --retries;
+        if (retries == 1) {
+            showLastPinAttemptPopup();
+        } else if (retries == 0) {
+            showPinBlockedPopup();
         }
+
+        return false;
     }
 
-    void sendResetPin(std::string puk, std::string newPin)
+    bool sendResetPin(std::string puk, std::string newPin)
     {
         int retries = -1;
         auto retriesMap = m_modem->retries().get();
@@ -86,56 +132,75 @@
             retries = retriesMap[Modem::PinType::puk];
         }
 
-        if (!m_modem->resetPin(Modem::PinType::pin, puk, newPin)) {
+        if (!m_modem->resetPin(Modem::PinType::puk, puk, newPin)) {
+            m_sd->showError(_("Sorry, incorrect PUK"));
             --retries;
             if (retries == 1) {
-                showLastPinAttemptPopup();
+                showLastPukAttemptPopup();
             } else if (retries == 0) {
-                showPinBlockedPopup([this](){ m_sd->close(); });
+                showSimPermanentlyBlockedPopup([this](){ m_sd->close(); });
             }
+            return false;
         }
+        return true;
     }
 
-
     void showLastPinAttemptPopup(std::function<void()> closed = std::function<void()>())
     {
-        // TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-        m_sd->showPopup(_("This will be the last attempt.<br>"
-                          "<br>"
-                          "If the SIM PIN is entered incorrectly, your SIM "
-                          "will be blocked and would require the PUK Code to unlock."),
-                        closed);
+        std::stringstream output;
+        output << ubuntu::i18n::argumentSubstitute(_("Sorry, incorrect %{1} PIN."),
+                                                   m_showSimIdentifiers.get() ?
+                                                       m_modem->simIdentifier().get()
+                                                     : "SIM");
+        output << " ";
+        output << _("This will be your last attempt.");
+        output << " ";
+        output << ubuntu::i18n::argumentSubstitute(_("If %{1} PIN is entered incorrectly you will require your PUK code to unlock."),
+                                                   m_showSimIdentifiers.get() ?
+                                                       m_modem->simIdentifier().get()
+                                                     : "SIM");
+        m_sd->showPopup(output.str(), closed);
     }
 
     void showPinBlockedPopup(std::function<void()> closed = std::function<void()>())
     {
-        // TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-        m_sd->showPopup(_("Your SIM is now blocked.<br>"
-                          "<br>"
-                          "Enter the PUK Code to unlock.<br>"
-                          "<br>"
-                          "You may contact your network provider for PUK Code."),
-                        closed);
+        std::stringstream output;
+        output << ubuntu::i18n::argumentSubstitute(std::string{_("Sorry, your %{1} is now blocked.")},
+                                                   m_showSimIdentifiers.get() ?
+                                                       m_modem->simIdentifier().get()
+                                                     : "SIM");
+        output << " ";
+        output << _("Please enter your PUK code to unblock SIM card.");
+        output << " ";
+        output << _("You may need to contact your network provider for PUK code.");
+
+        m_sd->showPopup(output.str(), closed);
     }
 
     void showLastPukAttemptPopup(std::function<void()> closed = std::function<void()>())
     {
-        // TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-        m_sd->showPopup(_("This will be the last attempt.<br>"
-                          "<br>"
-                          "If the PUK code is entered incorrectly, your SIM will need to be replaced.<br>"
-                          "<br>"
-                          "Please contact your network provider."),
-                        closed);
+        std::stringstream output;
+        output << _("Sorry, incorrect PUK.");
+        output << " ";
+        output << _("This will be your last attempt.");
+        output << " ";
+        output << _("If PUK code is entered incorrectly, your SIM card will be blocked and needs replacement.");
+        output << " ";
+        output << _("Please contact your network provider.");
+
+        m_sd->showPopup(output.str(), closed);
     }
 
     void showSimPermanentlyBlockedPopup(std::function<void()> closed = std::function<void()>())
     {
-        // TRANSLATORS: this string is not currently being shown on the screen. This message might be subject to change.
-        m_sd->showPopup(_("Your SIM is now permanently blocked and needs to be replaced.<br>"
-                          "<br>"
-                          "Please contact your network provider."),
-                        closed);
+        std::stringstream output;
+        output << _("Sorry, incorrect PUK.");
+        output << " ";
+        output << _("Your SIM card is now permanently blocked and needs replacement.");
+        output << " ";
+        output << _("Please contact your service provider.");
+
+        m_sd->showPopup(output.str(), closed);
     }
 
     Private();
@@ -153,13 +218,13 @@
 SimUnlockDialog::Private::Private()
 {
     m_sd = std::make_shared<notify::snapdecision::SimUnlock>();
+    m_showSimIdentifiers.set(false);
     reset();
 }
 
 void
 SimUnlockDialog::Private::update()
 {
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
     std::lock_guard<std::recursive_mutex> lock(m_updateMutex);
 
     if (!m_modem || !m_sd)
@@ -197,43 +262,51 @@
             // we are done.
             return;
         case Modem::PinType::pin:
-            /// @todo add SIM identifier
-            title = _("Enter SIM PIN");
+            title = ubuntu::i18n::argumentSubstitute(_("Enter %{1} PIN"),
+                                                     m_showSimIdentifiers.get() ?
+                                                         m_modem->simIdentifier().get()
+                                                       : "SIM");
             break;
         case Modem::PinType::puk:
-            /// @todo add SIM identifier
-            title = _("Enter PUK code");
+            if (!m_showSimIdentifiers.get())
+                title = _("Enter PUK code");
+            else
+                title = ubuntu::i18n::argumentSubstitute(_("Enter PUK code for %{1}"),
+                                                           m_modem->simIdentifier().get());
             break;
         }
         m_sd->pinMinMax().set(lengths[type]);
 
         std::string attempts;
         if (retries.find(type) != retries.end()) {
-            auto attempt = maxRetries[type] - retries[type] + 1;
-            gchar *tmp = g_strdup_printf(_("Attempt %d of %d"), attempt, maxRetries[type]);
+            gchar *tmp = g_strdup_printf(ngettext("1 attempt remaining", "%d attempts remaining", retries[type]), retries[type]);
             attempts = {tmp};
             g_free(tmp);
         }
 
-        /// @todo get a proper unlock dialog API..
-        if (attempts.empty()) {
-            m_sd->title().set(title);
-        } else {
-            m_sd->title().set("<b>" + title + "</b><br>" + attempts);
-        }
-        std::cout << m_sd->title().get() << std::endl;
+        m_sd->title().set(title);
+        m_sd->body().set(attempts);
         break;
     }
     case EnterPinStates::enterNewPin:
-        m_sd->title().set(_("Enter new PIN code"));
+        m_sd->body().set("Create new PIN");
+        m_sd->title().set(ubuntu::i18n::argumentSubstitute(_("Enter new %{1} PIN"),
+                                                           m_showSimIdentifiers.get() ?
+                                                               m_modem->simIdentifier().get()
+                                                             : "SIM"));
+        m_sd->pinMinMax().set(lengths[Modem::PinType::pin]);
         break;
     case EnterPinStates::confirmNewPin:
-        m_sd->title().set(_("Confirm new PIN code"));
+        m_sd->body().set("Create new PIN");
+        m_sd->title().set(ubuntu::i18n::argumentSubstitute(_("Confirm new %{1} PIN"),
+                                                           m_showSimIdentifiers.get() ?
+                                                               m_modem->simIdentifier().get()
+                                                             : "SIM"));
+        m_sd->pinMinMax().set(lengths[Modem::PinType::pin]);
         break;
     }
 
     /// @todo should be able to see cleartext puk and pin when entering puk or changing pin.
-    /// @todo add phone number or IMSI or something to the body
     m_sd->update();
     m_sd->show();
 }
@@ -241,8 +314,6 @@
 void
 SimUnlockDialog::Private::pinEntered(std::string pin)
 {
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
-
     std::lock_guard<std::recursive_mutex> lock(m_updateMutex);
     switch (m_enterPinState) {
     case EnterPinStates::initial:
@@ -250,10 +321,7 @@
         assert(0);
         return;
     case EnterPinStates::enterPin:
-        if (!m_modem->enterPin(Modem::PinType::pin, pin)) {
-            m_sd->showError(_("Oops!<br>Incorrect PIN entered."));
-        } else {
-            std::cout << "Correct PIN entered." << std::endl;
+        if (sendEnterPin(pin)) {
             m_sd->close();
             reset();
             return;
@@ -273,17 +341,14 @@
             m_enterPinState = EnterPinStates::enterNewPin;
             m_newPin.clear();
         } else {
-            if (!m_modem->resetPin(Modem::PinType::pin, m_pukCode, pin)) {
-                m_sd->showError(_("Oops!<br>Incorrect PUK entered."));
-                m_enterPinState = EnterPinStates::enterPuk;
-                m_pukCode.clear();
-                m_newPin.clear();
-            } else {
-                std::cout << "ResetPin succesfull." << std::endl;
+            if (sendResetPin(m_pukCode, pin)) {
                 m_sd->close();
                 reset();
                 return;
             }
+            m_enterPinState = EnterPinStates::enterPuk;
+            m_pukCode.clear();
+            m_newPin.clear();
         }
         break;
     }
@@ -293,21 +358,18 @@
 void
 SimUnlockDialog::Private::cancelled()
 {
-    std::cout << "SIM notification cancelled" << std::endl;
     m_sd->close();
 }
 
 void
 SimUnlockDialog::Private::closed()
 {
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
     reset();
 }
 
 void
 SimUnlockDialog::Private::reset()
 {
-    std::cout << __PRETTY_FUNCTION__ << std::endl;
     /** @todo
      * bug in dbus-cpp :/
      * can't disconnect here as the reset() is called from pinEnterer() and
@@ -410,6 +472,7 @@
 void
 SimUnlockDialog::changePin(Modem::Ptr modem)
 {
+    /// @todo do we need this?
     if (d->m_modem)
         throw std::logic_error("Unlocking already in progress.");
 
@@ -485,3 +548,8 @@
     return d->m_state;
 }
 
+core::Property<bool> &
+SimUnlockDialog::showSimIdentifiers()
+{
+    return d->m_showSimIdentifiers;
+}

=== modified file 'src/indicator/sim-unlock-dialog.h'
--- src/indicator/sim-unlock-dialog.h	2014-04-23 13:18:25 +0000
+++ src/indicator/sim-unlock-dialog.h	2014-10-07 17:43:18 +0000
@@ -55,6 +55,7 @@
     Modem::Ptr modem();
 
     core::Property<State> &state();
+    core::Property<bool> &showSimIdentifiers();
 };
 
 #endif

=== modified file 'src/menumodel-cpp/gio-helpers/variant.h'
--- src/menumodel-cpp/gio-helpers/variant.h	2014-08-15 11:59:20 +0000
+++ src/menumodel-cpp/gio-helpers/variant.h	2014-10-07 17:43:18 +0000
@@ -206,6 +206,34 @@
 };
 
 template<>
+struct Codec<std::vector<std::int32_t>>
+{
+    inline static GVariant *encode_argument(const std::vector<std::int32_t> &values)
+    {
+        GVariantBuilder builder;
+        g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));
+        for (auto value : values) {
+            std::int32_t tmp = value;
+            g_variant_builder_add(&builder,
+                                  "i",
+                                  tmp);
+        }
+        return g_variant_builder_end(&builder);
+    }
+    inline static void decode_argument(const Variant &variant, std::vector<std::int32_t> &values)
+    {
+        assert(variant);
+        assert(g_variant_is_of_type(variant, G_VARIANT_TYPE("ai")));
+        GVariantIter iter;
+        std::int32_t *val = 0;
+        g_variant_iter_init (&iter, variant);
+        while (g_variant_iter_loop (&iter, "i", &val)) {
+            values.push_back(*val);
+        }
+    }
+};
+
+template<>
 struct Codec<std::vector<Variant>>
 {
     inline static GVariant *encode_argument(const std::vector<Variant> &values)

=== modified file 'src/notify-cpp/snapdecision/sim-unlock.cpp'
--- src/notify-cpp/snapdecision/sim-unlock.cpp	2014-08-14 23:23:06 +0000
+++ src/notify-cpp/snapdecision/sim-unlock.cpp	2014-10-07 17:43:18 +0000
@@ -47,6 +47,7 @@
 
     Action::Ptr m_notifyAction;
     Action::Ptr m_pinMinMaxAction;
+    Action::Ptr m_popupAction;
     Action::Ptr m_errorAction;
     ActionGroup::Ptr m_actionGroup;
     ActionGroupExporter::Ptr m_actionGroupExporter;
@@ -55,6 +56,9 @@
     MenuItem::Ptr m_menuItem;
     MenuExporter::Ptr m_menuExporter;
 
+    std::function<void()> m_pendingErrorClosed;
+    std::function<void()> m_pendingPopupClosed;
+
     Private(const std::string &title,
             const std::string &body,
             std::pair<std::uint8_t, std::uint8_t> pinMinMax)
@@ -75,8 +79,6 @@
         modelActions["notifications"] = TypedVariant<std::string>(actionPath);
 
         std::map<std::string, Variant> modelPaths;
-        /// @todo hack!
-        // modelPaths["busName"] = TypedVariant<std::string>("com.canonical.indicator.network");
         modelPaths["busName"] = TypedVariant<std::string>(m_sessionBus->address());
         modelPaths["menuPath"] = TypedVariant<std::string>(menuPath);
         modelPaths["actions"] = TypedVariant<std::map<std::string, Variant>>(modelActions);
@@ -84,9 +86,8 @@
         m_menu = std::make_shared<Menu>();
         m_menuItem = std::make_shared<MenuItem>("", "notifications.simunlock");
         m_menuItem->setAttribute("x-canonical-type", TypedVariant<std::string>("com.canonical.snapdecision.pinlock"));
-        /// @todo we need both min and max.
-        m_menuItem->setAttribute("x-canonical-pin-length", TypedVariant<std::int32_t>(pinMinMax.first));
         m_menuItem->setAttribute("x-canonical-pin-min-max", TypedVariant<std::string>("notifications.pinMinMax"));
+        m_menuItem->setAttribute("x-canonical-pin-popup", TypedVariant<std::string>("notifications.popup"));
         m_menuItem->setAttribute("x-canonical-pin-error", TypedVariant<std::string>("notifications.error"));
         m_menu->append(m_menuItem);
 
@@ -104,26 +105,36 @@
         });
         m_actionGroup->add(m_notifyAction);
 
-#if 0
         m_pinMinMaxAction = std::make_shared<Action>("pinMinMax",
                                                      nullptr,
-                                                     TypedVariant<std::vector<std::int32_t>>(m_pinMinMax),
-                                                     [this](Variant state)
-        {
+                                                     TypedVariant<std::vector<std::int32_t>>({m_pinMinMax.get().first, m_pinMinMax.get().second}),
+                                                     [this](Variant)
+        {});
+        m_actionGroup->add(m_pinMinMaxAction);
+
+        m_popupAction = std::make_shared<Action>("popup",
+                                                  nullptr,
+                                                  TypedVariant<std::string>(""),
+                                                  [this](Variant)
+        {});
+        m_popupAction->activated().connect([this](Variant){
+            m_popupAction->setState(TypedVariant<std::string>(""));
+            if (m_pendingPopupClosed)
+                m_pendingPopupClosed();
+            m_pendingPopupClosed = std::function<void()>();
         });
-        m_actionGroup->add(m_pinMinMaxrAction);
-#endif
+        m_actionGroup->add(m_popupAction);
+
         m_errorAction = std::make_shared<Action>("error",
                                                   nullptr,
                                                   TypedVariant<std::string>(""),
-                                                  [this](Variant state)
-        {
-            auto tmp = state.as<std::string>();
-            if (tmp.empty()) {
-                // ack from the dialog side.
-                // find the error and call the cb
-            } else {
-            }
+                                                  [this](Variant)
+        {});
+        m_errorAction->activated().connect([this](Variant){
+            m_errorAction->setState(TypedVariant<std::string>(""));
+            if (m_pendingErrorClosed)
+                m_pendingErrorClosed();
+            m_pendingErrorClosed = std::function<void()>();
         });
         m_actionGroup->add(m_errorAction);
 
@@ -137,16 +148,13 @@
         m_notification->closed().connect([this](){ m_closed(); });
 
         m_title.changed().connect([this](const std::string &value){
-            /// @todo we need both min and max.
             m_notification->summary().set(value);
         });
         m_body.changed().connect([this](const std::string &value){
             m_notification->body().set(value);
         });
         m_pinMinMax.changed().connect([this](std::pair<std::uint8_t, uint8_t> value) {
-            /// @todo assert min <= max, also upon construction
-            m_menuItem->setAttribute("x-canonical-pin-length",
-                                     TypedVariant<std::int32_t>(value.first));
+            m_pinMinMaxAction->setState(TypedVariant<std::vector<std::int32_t>>({value.first, value.second}));
         });
     }
 };
@@ -220,15 +228,17 @@
 void
 SimUnlock::showError(std::string message, std::function<void()> closed)
 {
-    std::cerr << __PRETTY_FUNCTION__ << ": " << message << std::endl;
-    if (closed)
-        closed();
+    d->m_errorAction->setState(TypedVariant<std::string>(message));
+    if (d->m_pendingErrorClosed)
+        d->m_pendingErrorClosed();
+    d->m_pendingErrorClosed = closed;
 }
 
 void
 SimUnlock::showPopup(std::string message, std::function<void()> closed)
 {
-    std::cerr << __PRETTY_FUNCTION__ << ": " << message << std::endl;
-    if (closed)
-        closed();
+    d->m_popupAction->setState(TypedVariant<std::string>(message));
+    if (d->m_pendingPopupClosed)
+        d->m_pendingPopupClosed();
+    d->m_pendingPopupClosed = closed;
 }

=== modified file 'src/notify-cpp/snapdecision/sim-unlock.h'
--- src/notify-cpp/snapdecision/sim-unlock.h	2014-08-15 11:59:20 +0000
+++ src/notify-cpp/snapdecision/sim-unlock.h	2014-10-07 17:43:18 +0000
@@ -38,7 +38,7 @@
 
     explicit SimUnlock(const std::string &title = "",
               const std::string &body = "",
-              std::pair<std::uint8_t, std::uint8_t> pinMinMax = {0, -0});
+              std::pair<std::uint8_t, std::uint8_t> pinMinMax = {0, 0});
     ~SimUnlock();
 
     core::Signal<std::string> &pinEntered();

=== modified file 'tests/autopilot/indicator_network/data/pin-unlock.xml'
--- tests/autopilot/indicator_network/data/pin-unlock.xml	2014-05-02 01:40:42 +0000
+++ tests/autopilot/indicator_network/data/pin-unlock.xml	2014-10-07 17:43:18 +0000
@@ -242,7 +242,7 @@
     <set name="PIN2VALUE" value="5678"/>
 
     <!-- Value of the PUK that is required -->
-    <set name="PUKVALUE" value="1234567890"/>
+    <set name="PUKVALUE" value="12345678"/>
 
     <!-- Value of the PUK2 that is required -->
     <set name="PUK2VALUE" value="01010101"/>