Merge lp:~renatofilho/address-book-app/fix-1522010 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Check for sim card contacts on "GSettings.schemaChanged" signal.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1041/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/344
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5549
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5563
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25713

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/1041/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/fix-1522010]

515. By Renato Araujo Oliveira Filho on 2015-12-02

Check for sim card contacts on "GSettings.schemaChanged" signal.

516. By Renato Araujo Oliveira Filho on 2015-12-02

Remove unused var.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1043/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/346
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5553
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25722

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/1043/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Settings/SettingsPage.qml	2015-12-02 15:54:38 +0000
@@ -84,9 +84,12 @@
         id: simCardImportPageComponent
 
         ContactsUI.SIMCardImportPage {
+            id: importFromSimPage
+
             objectName: "simCardImportPage"
             targetModel: root.contactListModel
             sims: simList.sims
+            onImportCompleted: pageStack.removePages(root)
         }
     }
 }

=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-12-02 15:54:38 +0000
@@ -31,6 +31,8 @@
     property var targetModel: null
     property var sims: []
 
+    signal importCompleted()
+
     title: i18n.dtr("address-book-app", "SIM contacts")
 
     function lockedSIMCount()
@@ -145,6 +147,7 @@
             if (vcardFile != "" && !contactImported) {
                 contactImported = true
                 contactList.listModel.importContacts(vcardFile)
+
             }
         }
         onVcardFileChanged: {
@@ -167,7 +170,7 @@
             if ((error === ContactModel.ExportNoError) && targetModel) {
                 targetModel.importContacts(url)
              }
-            pageStack.removePages(root)
+            root.importCompleted()
         }
     }
 

=== modified file 'src/imports/Ubuntu/Contacts/SIMList.qml'
--- src/imports/Ubuntu/Contacts/SIMList.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/SIMList.qml	2015-12-02 15:54:38 +0000
@@ -39,6 +39,10 @@
 
     function createQML (modems)
     {
+        if (!phoneSettings.simNames) {
+            return
+        }
+
         var component = Qt.createComponent(Qt.resolvedUrl("Ofono.qml"));
 
         sims.forEach(function (sim) {
@@ -72,6 +76,12 @@
     GSettings {
         id: phoneSettings
         schema.id: "com.ubuntu.phone"
+        onChanged: {
+            if (key === "simNames") {
+                root.createQML(ofonoManager.modems.slice(0).sort())
+            }
+        }
+        onSchemaChanged: root.createQML(ofonoManager.modems.slice(0).sort())
     }
 
     OfonoManager {