Merge lp:~tiagosh/dialer-app/sim-presence into lp:dialer-app

[Tiago Salem Herrmann]

- Display operator name in the header when available
- Do not display slots without sim cards.

- Display operator name in the header when available
- Do not display slots without sim cards.

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

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/dialer-app) 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?
Yes

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)]

FAILED: Continuous integration, rev:228
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/395/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/165
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/166
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3630
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2839
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3520
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4877
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11590
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3123
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3123/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/395/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/sim-presence]

229. By Tiago Salem Herrmann on 2014-08-19

restore binding when needed

230. By Tiago Salem Herrmann on 2014-08-19

- improve dual sim support
- show sim label in live call view

231. By Tiago Salem Herrmann on 2014-08-19

fix dialog creation

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/403/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/173
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/173/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/174
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3791
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2916
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5038
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5038/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11760
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2367
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3200/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/403/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/176
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/175
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/176
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3809
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2927
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3670
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5056
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5056/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11776
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3211
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3211/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/405/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, but that's because this branch has a dependency on other changes.

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 'po/dialer-app.pot'
--- po/dialer-app.pot	2014-07-17 17:56:04 +0000
+++ po/dialer-app.pot	2014-08-19 19:47:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-16 19:26+0200\n"
+"POT-Creation-Date: 2014-08-15 18:33-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"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/qml/DialerPage/Keypad.qml:202
+#: src/qml/DialerPage/Keypad.qml:174
 msgid "#"
 msgstr ""
 
@@ -43,140 +43,152 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/DialerPage/Keypad.qml:179
+#: src/qml/DialerPage/Keypad.qml:150
 msgid "*"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:189
+#: src/qml/DialerPage/Keypad.qml:161 src/qml/DialerPage/DialerPage.qml:326
 msgid "+"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:188
+#: src/qml/ContactsPage/ContactsPage.qml:186
+msgid "+ Create New"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:160
 msgid "0"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:86
+#: src/qml/DialerPage/Keypad.qml:49
 msgid "1"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:97
+#: src/qml/DialerPage/Keypad.qml:60
 msgid "2"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:107
+#: src/qml/DialerPage/Keypad.qml:71
 msgid "3"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:117
+#: src/qml/DialerPage/Keypad.qml:82
 msgid "4"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:127
+#: src/qml/DialerPage/Keypad.qml:93
 msgid "5"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:137
+#: src/qml/DialerPage/Keypad.qml:104
 msgid "6"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:147
+#: src/qml/DialerPage/Keypad.qml:115
 msgid "7"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:157
+#: src/qml/DialerPage/Keypad.qml:126
 msgid "8"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:167
+#: src/qml/DialerPage/Keypad.qml:137
 msgid "9"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:98
+#: src/qml/DialerPage/Keypad.qml:61
 msgid "ABC"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
-msgid "Add Contact"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
-msgid "Add to existing contact"
-msgstr ""
-
-#: src/qml/dialer-app.qml:244
+#: src/qml/ContactsPage/ContactsPage.qml:71
+msgid "All"
+msgstr ""
+
+#: src/qml/dialer-app.qml:376
 msgid "Call Barring"
 msgstr ""
 
-#: src/qml/dialer-app.qml:255
+#: src/qml/dialer-app.qml:387
 msgid "Call Forwarding"
 msgstr ""
 
-#: src/qml/dialer-app.qml:266
+#: src/qml/dialer-app.qml:398
 msgid "Call Waiting"
 msgstr ""
 
-#: src/qml/MainPage.qml:56
-msgid "Call log"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
-msgid "Call now"
-msgstr ""
-
-#: src/qml/dialer-app.qml:277
+#: src/qml/dialer-app.qml:409
 msgid "Calling Line Presentation"
 msgstr ""
 
-#: src/qml/dialer-app.qml:289
+#: src/qml/dialer-app.qml:421
 msgid "Calling Line Restriction"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
+#: src/qml/ContactsPage/ContactsPage.qml:85
 msgid "Cancel"
 msgstr ""
 
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:29
+msgid "Change all Call associations to "
+msgstr ""
+
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:30 src/qml/dialer-app.qml:270
+msgid "Close"
+msgstr ""
+
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
-#: src/qml/LiveCallPage/LiveCall.qml:49
 msgid "Conference"
 msgstr ""
 
-#: src/qml/dialer-app.qml:283
+#: src/qml/dialer-app.qml:415
 msgid "Connected Line Presentation"
 msgstr ""
 
-#: src/qml/dialer-app.qml:295
+#: src/qml/dialer-app.qml:427
 msgid "Connected Line Restriction"
 msgstr ""
 
-#: src/qml/MainPage.qml:45
+#: src/qml/ContactsPage/ContactsPage.qml:32
+#: src/qml/DialerPage/DialerPage.qml:39
 msgid "Contacts"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
-msgid "Create new contact"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:108
+#: src/qml/DialerPage/Keypad.qml:72
 msgid "DEF"
 msgstr ""
 
-#: src/qml/HistoryPage/HistoryPage.qml:69
+#: src/qml/HistoryPage/HistoryPage.qml:271
 msgid "Delete"
 msgstr ""
 
-#: src/qml/dialer-app.qml:169 src/qml/dialer-app.qml:183
+#: src/qml/HistoryPage/HistoryPage.qml:279
+msgid "Details"
+msgstr ""
+
+#: src/qml/dialer-app.qml:306 src/qml/dialer-app.qml:320
 msgid "Dismiss"
 msgstr ""
 
-#: src/qml/DialerPage/DialerPage.qml:89
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:66
+msgid "Don't ask again"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:223
 msgid "Enter a number"
 msgstr ""
 
-#: src/qml/dialer-app.qml:166
+#: src/qml/dialer-app.qml:303
 msgid "Error"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:118
+#: src/qml/ContactsPage/ContactsPage.qml:71
+msgid "Favorites"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:51
+msgid "Flight mode"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:83
 msgid "GHI"
 msgstr ""
 
@@ -184,23 +196,27 @@
 msgid "Hangup"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
-msgid "How do you want to save the contact?"
+#: src/qml/HistoryPage/HistoryDelegate.qml:60
+msgid "Incoming"
 msgstr ""
 
-#: src/qml/dialer-app.qml:167
+#: src/qml/dialer-app.qml:304
 msgid "Invalid USSD code"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:128
+#: src/qml/DialerPage/Keypad.qml:94
 msgid "JKL"
 msgstr ""
 
-#: src/qml/MainPage.qml:35
+#: src/qml/DialerPage/DialerPage.qml:57
 msgid "Keypad"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:138
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80
+msgid "Later"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:105
 msgid "MNO"
 msgstr ""
 
@@ -208,15 +224,36 @@
 msgid "Merge calls"
 msgstr ""
 
-#: src/qml/LiveCallPage/LiveCall.qml:75
-msgid "New call"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:148
+#: src/qml/HistoryPage/HistoryDelegate.qml:58
+msgid "Missed"
+msgstr ""
+
+#: src/qml/LiveCallPage/LiveCall.qml:60
+msgid "New Call"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:39
+msgid "No"
+msgstr ""
+
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:26
+msgid "No SIM card selected"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:59 src/qml/dialer-app.qml:265
+msgid "No network"
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryDelegate.qml:62
+msgid "Outgoing"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:116
 msgid "PQRS"
 msgstr ""
 
-#: src/qml/dialer-app.qml:147
+#: src/qml/dialer-app.qml:284
 msgid "Please wait"
 msgstr ""
 
@@ -224,58 +261,96 @@
 msgid "Private"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
-msgid "Save contact"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
-msgid "Send text message"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:158
+#: src/qml/HistoryPage/HistoryDelegate.qml:171
+msgid "Private number"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:83 src/qml/HistoryPage/HistoryPage.qml:43
+msgid "Recent"
+msgstr ""
+
+#: src/qml/ContactsPage/ContactsPage.qml:60
+msgid "Search"
+msgstr ""
+
+#: src/qml/ContactsPage/ContactsPage.qml:48
+msgid "Search..."
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryPage.qml:43
+msgid "Select"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:58
+msgid ""
+"Select a default SIM for all outgoing calls. You can always alter your "
+"choice in <a href=\"system_settings\">System Settings</a>."
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryPage.qml:292
+msgid "Send message"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:44
+msgid "Settings"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:27
+msgid "Switch to default SIM:"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:127
 msgid "TUV"
 msgstr ""
 
+#: src/qml/dialer-app.qml:266
+#, qt-format
+msgid "There is currently no network on %1"
+msgstr ""
+
+#: src/qml/dialer-app.qml:267
+msgid "There is currently no network."
+msgstr ""
+
 #: src/qml/HistoryPage/dateUtils.js:41
 msgid "Today"
 msgstr ""
 
-#: src/qml/LiveCallPage/LiveCall.qml:47
-msgid "Two Calls"
-msgstr ""
-
-#: src/qml/HistoryPage/HistoryDelegate.qml:139
-msgid "Unknown"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
-msgid "View contact"
+#: src/qml/HistoryPage/HistoryDelegate.qml:173
+msgid "Unknown number"
 msgstr ""
 
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
 msgid "Voicemail"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:168
+#: src/qml/DialerPage/Keypad.qml:138
 msgid "WXYZ"
 msgstr ""
 
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:49
+msgid "Yes"
+msgstr ""
+
 #: src/qml/HistoryPage/dateUtils.js:43
 msgid "Yesterday"
 msgstr ""
 
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:27
+msgid "You need to select a SIM card"
+msgstr ""
+
+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 msgid "active"
 msgstr ""
 
+#: src/qml/LiveCallPage/LiveCall.qml:237
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
-#: src/qml/LiveCallPage/LiveCall.qml:409
 msgid "calling"
 msgstr ""
 
+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 msgid "on hold"
 msgstr ""

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-08-13 22:27:43 +0000
+++ src/qml/DialerPage/DialerPage.qml	2014-08-19 19:47:22 +0000
@@ -46,7 +46,18 @@
         }
     ]
 
-    title: i18n.tr("Keypad")
+    title: {
+        if (telepathyHelper.flightMode) {
+            return i18n.tr("Flight mode")
+        } else if (mainView.account && mainView.account.networkName != "") {
+            return mainView.account.networkName
+        } else if (multipleAccounts && !mainView.account) {
+            // TODO: check what should be displayed when there are multiple accounts
+            // but no default selected
+            return i18n.tr("Keypad")
+        }
+        return i18n.tr("No network")
+    }
 
     // -------- Greeter mode ----------
     states: [
@@ -120,14 +131,11 @@
                 mainView.switchToKeypadView();
             }
         }
-        onAccountChanged: {
-            var newAccountIndex = accountIndex(account);
-            if (newAccountIndex >= 0 && newAccountIndex !== page.head.sections.selectedIndex) {
-                page.head.sections.selectedIndex = newAccountIndex
-            }
-        }
+        onAccountChanged: head.sections.selectedIndex = accountIndex(mainView.account)
     }
 
+    Component.onCompleted: head.sections.selectedIndex = accountIndex(mainView.account)
+
     head.sections.model: {
         // does not show dual sim switch if there is only one sim
         if (!multipleAccounts) {
@@ -135,24 +143,16 @@
         }
 
         var accountNames = []
-        for(var i=0; i < telepathyHelper.accounts.length; i++) {
-            accountNames.push(telepathyHelper.accounts[i].displayName)
+        for(var i=0; i < telepathyHelper.activeAccounts.length; i++) {
+            accountNames.push(telepathyHelper.activeAccounts[i].displayName)
         }
         return accountNames
     }
 
-    // Account switcher
-    head.sections.selectedIndex: {
-        if (!mainView.account) {
-            return -1
-        }
-        return accountIndex(mainView.account)
-    }
-
     Connections {
         target: page.head.sections
         onSelectedIndexChanged: {
-            mainView.account = telepathyHelper.accounts[page.head.sections.selectedIndex]
+            mainView.account = telepathyHelper.activeAccounts[page.head.sections.selectedIndex]
         }
     }
 
@@ -341,7 +341,7 @@
                 // check if at least one account is selected
                 if (multipleAccounts && !mainView.account) {
                     Qt.inputMethod.hide()
-                    PopupUtils.open(Qt.createObject("../Dialogs/NoSIMCardSelectedDialog.qml").createObject(page))
+                    PopupUtils.open(Qt.createComponent("../Dialogs/NoSIMCardSelectedDialog.qml").createObject(page))
                     return
                 }
 

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-11 21:58:24 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-19 19:47:22 +0000
@@ -35,7 +35,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 height: paintedHeight + units.gu(3)
                 Repeater {
-                    model: telepathyHelper.accounts
+                    model: telepathyHelper.activeAccounts
                     delegate: Label {
                         text: modelData.displayName
                         color: UbuntuColors.orange

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-07-31 08:22:43 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-08-19 19:47:22 +0000
@@ -70,6 +70,7 @@
 
     title: caller
     head.actions: greeter.greeterActive ? greeterModeActions : regularActions
+    head.sections.model: multipleAccounts ? [call.account.displayName] : []
     x: header ? header.height : 0
 
     // if there are no calls, just reset the view

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-08-13 22:27:59 +0000
+++ src/qml/dialer-app.qml	2014-08-19 19:47:22 +0000
@@ -30,14 +30,16 @@
     property bool applicationActive: Qt.application.active
     property string ussdResponseTitle: ""
     property string ussdResponseText: ""
-    property bool multipleAccounts: telepathyHelper.accounts.length > 1
-    property QtObject account: {
+    property bool multipleAccounts: telepathyHelper.activeAccounts.length > 1
+    property QtObject account: defaultAccount()
+
+    function defaultAccount() {
         // we only use the default account property if we have more
         // than one account, otherwise we use always the first one
         if (multipleAccounts) {
             return telepathyHelper.defaultCallAccount
         } else {
-            return telepathyHelper.accounts[0]
+            return telepathyHelper.activeAccounts[0]
         }
     }
 
@@ -72,6 +74,20 @@
         }
     }
 
+    Connections {
+        target: telepathyHelper
+        onActiveAccountsChanged: {
+            // check if the selected account is not active anymore
+            for (var i in telepathyHelper.activeAccounts) {
+                if (telepathyHelper.activeAccounts[i] == account) {
+                    return;
+                }
+            }
+            account = Qt.binding(defaultAccount)
+        }
+        onDefaultCallAccountChanged: account = Qt.binding(defaultAccount)
+    }
+
     Settings {
         id: settings
         category: "DualSim"