Merge lp:~ken-vandine/ubuntu-system-settings/lp1364452 into lp:ubuntu-system-settings

[Ken VanDine]

Don't show the phone number in the about page, that is now provided by address-book-app

Don't show the phone number in the about page, that is now provided by address-book-app

[lp:~ken-vandine/ubuntu-system-settings/lp1364452]

1508. By Ken VanDine on 2015-08-19

removed phone number tests from the about page tests

[Jonas G. Drange (jonas-drange)]

Thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2325/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3804
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/509
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3801
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3801/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22679

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2325/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2327/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/511
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3805
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3805/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22687

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2327/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2329/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3810
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/104
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/513
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3807
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3807/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22694

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2329/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/about/CMakeLists.txt'
--- plugins/about/CMakeLists.txt	2014-09-25 11:17:42 +0000
+++ plugins/about/CMakeLists.txt	2015-08-19 14:05:17 +0000
@@ -9,8 +9,6 @@
     EntryComponent.qml
     License.qml
     PageComponent.qml
-    PhoneNumber.qml
-    PhoneNumbers.qml
     SingleValueStacked.qml
     Software.qml
     Storage.qml

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2015-04-13 19:06:15 +0000
+++ plugins/about/PageComponent.qml	2015-08-19 14:05:17 +0000
@@ -45,18 +45,7 @@
 
     OfonoManager {
         id: manager
-        onModemsChanged: {
-            root.modemsSorted = modems.slice(0).sort();
-            if (modems.length === 1) {
-                phoneNumbers.setSource("PhoneNumber.qml", {
-                    path: manager.modems[0]
-                });
-            } else if (modems.length > 1) {
-                phoneNumbers.setSource("PhoneNumbers.qml", {
-                    paths: root.modemsSorted
-                });
-            }
-        }
+        onModemsChanged: root.modemsSorted = modems.slice(0).sort()
     }
 
     NetworkAbout {
@@ -104,12 +93,6 @@
                 highlightWhenPressed: false
             }
 
-            Loader {
-                id: phoneNumbers
-                anchors.left: parent.left
-                anchors.right: parent.right
-            }
-
             ListItem.SingleValue {
                 id: serialItem
                 objectName: "serialItem"

=== removed file 'plugins/about/PhoneNumber.qml'
--- plugins/about/PhoneNumber.qml	2014-09-01 16:10:30 +0000
+++ plugins/about/PhoneNumber.qml	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2014 Canonical Ltd.
- *
- * Contact: Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import MeeGo.QOfono 0.2
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-ListItem.SingleValue {
-
-    property string path
-
-    OfonoSimManager {
-        id: sim
-        modemPath: path
-    }
-
-    id: numberItem
-    objectName: "numberItem"
-    text: i18n.tr("Phone number")
-    property string phoneNumber
-    phoneNumber: sim.subscriberNumbers.length > 0 ?
-        sim.subscriberNumbers[0] : ""
-    value: phoneNumber
-    visible: value
-}

=== removed file 'plugins/about/PhoneNumbers.qml'
--- plugins/about/PhoneNumbers.qml	2014-09-01 16:10:30 +0000
+++ plugins/about/PhoneNumbers.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2014 Canonical Ltd.
- *
- * Contact: Jonas G. Drange <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import GSettings 1.0
-import MeeGo.QOfono 0.2
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Column {
-
-    property var paths
-
-    ListItem.Standard {
-        text: i18n.tr("Phone number:")
-        visible: phoneNumber1.visible
-    }
-
-    ListItem.SingleValue {
-
-        id: phoneNumber1
-        objectName: "numberItem1"
-
-        OfonoSimManager {
-            id: sim1
-            modemPath: paths[0]
-        }
-        property string phoneNumber
-        phoneNumber: sim1.subscriberNumbers.length > 0 ?
-            sim1.subscriberNumbers[0] : ""
-        value: phoneNumber
-        visible: value
-    }
-
-    ListItem.SingleValue {
-
-        id: phoneNumber2
-        objectName: "numberItem2"
-
-        OfonoSimManager {
-            id: sim2
-            modemPath: paths[1]
-        }
-        property string phoneNumber
-        phoneNumber: sim2.subscriberNumbers.length > 0 ?
-            sim2.subscriberNumbers[0] : ""
-        value: phoneNumber
-        visible: value
-    }
-
-    GSettings {
-        id: phoneSettings
-        schema.id: "com.ubuntu.phone"
-        Component.onCompleted: {
-            // set default names
-            var simNames = phoneSettings.simNames;
-            var m0 = paths[0];
-            var m1 = paths[1];
-            if (!simNames[m0]) {
-                simNames[m0] = "SIM 1";
-            }
-            if (!simNames[m1]) {
-                simNames[m1] = "SIM 2";
-            }
-            phoneSettings.simNames = simNames;
-        }
-    }
-
-    Binding {
-        target: phoneNumber1
-        property: "text"
-        value: phoneSettings.simNames[paths[0]]
-    }
-
-    Binding {
-        target: phoneNumber2
-        property: "text"
-        value: phoneSettings.simNames[paths[1]]
-    }
-}

=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-12-10 20:47:38 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2015-08-19 14:05:17 +0000
@@ -132,21 +132,6 @@
             displayed_imei = self.about_page.get_imei()
             self.assertThat(displayed_imei, Equals(device_imei))
 
-    def test_phone_number(self):
-        self.assertEqual(str(self.about_page.get_number('numberItem')),
-                         '123456789')
-
-
-class AboutOfonoMultiSimTestCase(AboutOfonoBaseTestCase):
-
-    use_sims = 2
-
-    def test_phone_numbers(self):
-        self.assertEqual(str(self.about_page.get_number('numberItem1')),
-                         '123456789')
-        self.assertEqual(str(self.about_page.get_number('numberItem2')),
-                         '08123')
-
 
 class AboutSystemImageTestCase(AboutSystemImageBaseTestCase):