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

[Ken VanDine]

[cellular/apn] new APN panel made for the new 'Preferred' property, as well as the 'ResetContext' method.

New UI due to new NetworkManager, Nuntium and Ofono backend.

Silo: 33

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
Yes
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Yes
 * Has your component "TestPlan” been executed successfully on emulator, N4?
No, it's currently being written AND the NetworkManager backend change has not landed yet.
 * Has a 5 minute exploratory testing run been executed on N4?
N/A
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
Yes, kenvandine
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
mpt
 * What components might get impacted by your changes?
NetworkManager, Nuntium, Ofono
 * Have you requested review by the teams of these owning components?
Yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2218/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/79
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/447
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22146

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

This is just fixing a merge conflict from jonas' branch, which is approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2235/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/419
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3533
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3533/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22248

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2236/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/420
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3535
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3535/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22250

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2015-03-26 21:57:53 +0000
+++ plugins/cellular/CMakeLists.txt	2015-07-27 14:21:15 +0000
@@ -4,9 +4,10 @@
 install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
 
 set(QML_SOURCES
-    apn.js
+    apn_manager.js
+    apn_editor.js
     carriers.js
-    CustomApnEditor.qml
+    PageApnEditor.qml
     PageChooseApn.qml
     PageChooseCarrier.qml
     PageCarrierAndApn.qml
@@ -23,8 +24,6 @@
   plugin.h
   hotspotmanager.cpp
   hotspotmanager.h
-  ofonoactivator.cpp
-  ofonoactivator.h
   connectivity.cpp
   connectivity.h
   nm_manager_proxy.h
 
=== modified file 'plugins/cellular/Components/CMakeLists.txt'
--- plugins/cellular/Components/CMakeLists.txt	2014-11-12 12:46:51 +0000
+++ plugins/cellular/Components/CMakeLists.txt	2015-07-27 14:21:15 +0000
@@ -1,12 +1,15 @@
 set(QML_SOURCES
     DataMultiSim.qml
     DefaultSim.qml
+    KeyboardRectangle.qml
+    LabelTextField.qml
     MultiSim.qml
     NoSim.qml
     RadioSingleSim.qml
     Sim.qml
     SimEditor.qml
     SingleSim.qml
+    StandardAnimation.qml
 )
 install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
 
 
=== added file 'plugins/cellular/Components/KeyboardRectangle.qml'
--- plugins/cellular/Components/KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/KeyboardRectangle.qml	2015-07-27 14:21:15 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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.2
+
+Item {
+    id: keyboardRect
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    Behavior on height {
+        StandardAnimation { }
+    }
+
+    states: [
+        State {
+            name: "hidden"
+            when: keyboardRect.height == 0
+        },
+        State {
+            name: "shown"
+            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
+        }
+    ]
+
+    function recursiveFindFocusedItem(parent) {
+        if (parent.activeFocus) {
+            return parent;
+        }
+
+        for (var i in parent.children) {
+            var child = parent.children[i];
+            if (child.activeFocus) {
+                return child;
+            }
+
+            var item = recursiveFindFocusedItem(child);
+
+            if (item != null) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    Connections {
+        target: Qt.inputMethod
+
+        onVisibleChanged: {
+            if (!Qt.inputMethod.visible) {
+                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
+                if (focusedItem != null) {
+                    focusedItem.focus = false;
+                }
+            }
+        }
+    }
+}
 
=== added file 'plugins/cellular/Components/LabelTextField.qml'
--- plugins/cellular/Components/LabelTextField.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/LabelTextField.qml	2015-07-27 14:21:15 +0000
@@ -0,0 +1,54 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * 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 Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 0.1
+import Ubuntu.Keyboard 0.1
+import SystemSettings 1.0
+
+TextField {
+    id: field
+    property var next
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    height: implicitHeight + units.gu(2)
+    style: TextFieldStyle {
+        overlaySpacing: units.gu(1)
+        frameSpacing: units.gu(1)
+        background: Rectangle {
+            property bool error: (field.hasOwnProperty("errorHighlight") &&
+                                 field.errorHighlight &&
+                                 !field.acceptableInput)
+            onErrorChanged: error ? UbuntuColors.orange : color
+            color: Theme.palette.selected.background
+            anchors.fill: parent
+            visible: field.activeFocus
+        }
+        color: UbuntuColors.lightAubergine
+    }
+
+    // Ubuntu.Keyboard
+    // TRANSLATORS: This is the text that will be used on the "return" key for the virtual keyboard,
+    // this word must be less than 5 characters
+    InputMethod.extensions: { "enterKeyText": i18n.tr("Next") }
+    KeyNavigation.tab: next
+    Keys.onReturnPressed: next.forceActiveFocus()
+}
 
=== added file 'plugins/cellular/Components/StandardAnimation.qml'
--- plugins/cellular/Components/StandardAnimation.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/Components/StandardAnimation.qml	2015-07-27 14:21:15 +0000
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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.2
+
+NumberAnimation {
+    duration: 300
+    easing.type: Easing.InOutQuad
+}
 
=== renamed file 'plugins/cellular/CustomApnEditor.qml' => 'plugins/cellular/PageApnEditor.qml'
--- plugins/cellular/CustomApnEditor.qml	2015-03-27 15:01:01 +0000
+++ plugins/cellular/PageApnEditor.qml	2015-07-27 14:21:15 +0000
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2014 Canonical Ltd.
  *
- * Contact: Pat McGowan <[e-mail]>
+ * Contact: Pat McGowan <[e-mail]>,
+ *          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
@@ -19,367 +20,414 @@
  */
 
 import QtQuick 2.0
-import QtQuick.Layouts 1.1
 import SystemSettings 1.0
 import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
-import "apn.js" as APN
+import MeeGo.QOfono 0.2
+import "Components" as LocalComponents
+import "apn_editor.js" as Editor
 
 ItemPage {
-    objectName: "customapnPage"
     id: root
-
-    // "internet" or "mms"
-    property var type
-
-    // dict of "type" : ctx
-    property var contexts;
-
-    /// work around LP(#1361919)
-    property var activateCb;
-
-    // Sim qml object
-    property var sim
-
-    QtObject {
-        id: d
-        property var typeText : type === "internet" ? i18n.tr("Internet") : i18n.tr("MMS")
-        property bool isMms : type === "mms"
-
-        property bool isValid : false
-
-        function validateFields() {
-            if (apnName.text === "") {
-                isValid = false;
-                return
-            }
-            if (isMms) {
-                if (mmsc.text === "") {
-                    isValid = false;
-                    return;
-                }
-                /// @todo validate proxy
-                /// @todo force port to be integer and validate it's value
-            }
-
-            // @todo the rest
-            isValid = true;
-        }
-    }
-
-    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
-    title: i18n.tr("Custom %1 APN").arg(d.typeText)
-
-    // workaround of getting the following error on startup:
-    // WARNING - ... : QML Page: Binding loop detected for property "flickable"
+    objectName: "apnEditor"
+
+    // Property that holds the APN manager (apn_manager.js) module.
+    property var manager
+
+    property OfonoContextConnection contextQML
+
+    // All models.
+    property ListModel mmsModel
+    property ListModel internetModel
+    property ListModel iaModel
+
+    // Flags that indicate what context we are editing.
+    property bool isCombo: Editor.indexToType(typeSel.selectedIndex) === 'internet+mms'
+    property bool isInternet: Editor.indexToType(typeSel.selectedIndex) === 'internet'
+    property bool isMms: Editor.indexToType(typeSel.selectedIndex) === 'mms'
+    property bool isIa: Editor.indexToType(typeSel.selectedIndex) === 'ia'
+
+    property bool isValid: Editor.isValid()
+
+    // priv
+    property bool _edgeReady: false
+
+    property QtObject activeItem: null
+
+    // When a user has requested saving a context.
+    signal saving ()
+
+    // When user has saved a context.
+    signal saved ()
+
+    // Signal for new contexts.
+    signal newContext (OfonoContextConnection context)
+
+    // When user cancels.
+    signal canceled ()
+
+    title: contextQML ? i18n.tr("Edit") : i18n.tr("New APN")
+
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: root.head
+            actions: [
+                Action {
+                    objectName: "saveApn"
+                    iconName: "ok"
+                    enabled: isValid
+                    onTriggered: Editor.saving()
+                }
+            ]
+        },
+        PageHeadState {
+            name: "busy"
+            head: root.head
+            actions: [
+                Action {
+                    iconName: "ok"
+                    enabled: false
+                }
+            ]
+        },
+        State {
+            name: "busy"
+            PropertyChanges { target: name; enabled: false; }
+            PropertyChanges { target: accessPointName; enabled: false; }
+            PropertyChanges { target: username; enabled: false; }
+            PropertyChanges { target: password; enabled: false; }
+            PropertyChanges { target: messageCenter; enabled: false; }
+            PropertyChanges { target: messageProxy; enabled: false; }
+            PropertyChanges { target: port; enabled: false; }
+        }
+    ]
+
+    onSaving: state = "busy"
+    onSaved: pageStack.pop();
+    onCanceled: pageStack.pop();
+    onNewContext: Editor.newContext(context);
+
+    Component.onCompleted: {
+        if (contextQML) {
+            Editor.populate(contextQML);
+        }
+        Editor.ready();
+    }
+
+    // We need to disable keyboard anchoring because we implement the
+    // KeyboardRectangle pattern
+    Binding {
+        target: main
+        property: "anchorToKeyboard"
+        value: false
+    }
+
     flickable: null
-    Component.onCompleted: {
-        flickable: scrollWidget
-
-        var ctx;
-        if (d.isMms) {
-            ctx = contexts["mms"];
-            if (ctx === undefined) {
-                // @bug LP(:#1362795)
-                return;
-            }
-        } else {
-            ctx = contexts["internet"]
-        }
-
-        // We do not have any context yet, we will create one, but not now.
-        // We create it once the user presses 'Activate'.
-        if (!ctx) {
-            return;
-        }
-
-        apnName.text = ctx.accessPointName;
-        userName.text = ctx.username;
-        pword.text = ctx.password;
-        mmsc.text = ctx.messageCenter;
-        var proxyText = ctx.messageProxy.split(":");
-        proxy.text = proxyText[0] !== undefined ? proxyText[0] : "";
-        port.text = proxyText[1] !== undefined ? proxyText[1] : "";
-        /// @todo protocol values
-
-        if (d.isMms) {
-            /// @todo disabled for now
-            doBoth.checked = false;
-            return;
-            var internetApn = contexts["internet"]
-            if (ctx.accessPointName === internetApn.accessPointName &&
-                ctx.username == internetApn.username &&
-                ctx.password == internetApn.password
-                /* auth + procol */) {
-                doBoth.checked = true;
-            }
-            else
-                doBoth.checked = false;
-        }
-    }
-
     Flickable {
-        id: scrollWidget
+        id: scrollArea
+        objectName: "scrollArea"
+
+        // this is necessary to avoid the page to appear below the header
+        clip: true
+        flickableDirection: Flickable.VerticalFlick
         anchors {
-            top: parent.top
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            margins: units.gu(2)
+            fill: parent
+            bottomMargin: keyboard.height
         }
+        contentHeight: contents.height + units.gu(2)
         contentWidth: parent.width
-        clip: true
-        contentHeight: theContents.height
-        boundsBehavior: (contentHeight > height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-        flickableDirection: Flickable.VerticalFlick
-
-        ColumnLayout {
-            id: theContents
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-            spacing: units.gu(2)
-
-            ListItem.Standard {
-                id: sameSwitch
-                anchors {
-                    left: parent.left
-                    right: parent.right
+
+        // after add a new field we need to wait for the contentHeight to
+        // change to scroll to the correct position
+        onContentHeightChanged: Editor.makeMeVisible(root.activeItem)
+
+        Column {
+            id: contents
+            anchors { left: parent.left; right: parent.right; }
+
+            // Type controls
+            Column {
+                anchors { left: parent.left; right: parent.right; }
+
+                SettingsItemTitle {
+                    text: i18n.tr("Used for:")
                 }
-                /// @todo disable for now
-                //visible: d.isMms
-                visible: false
-                text: i18n.tr("Same APN as for Internet")
-                control: Switch {
-                    id: doBoth
-                    checked: false
-                    anchors.verticalCenter: parent.verticalCenter
-                    onClicked: {
-                        if (checked) {
-                            var internetApn = contexts["internet"]
-                            apnName.text = internetApn.accessPointName;
-                            userName.text = internetApn.username;
-                            pword.text = internetApn.password;
-                        }
+
+                ListItem.ItemSelector {
+                    model: [i18n.tr('Internet and MMS'),
+                            i18n.tr('Internet'),
+                            i18n.tr('MMS'),
+                            i18n.tr('LTE'), ]
+                    id: typeSel
+                    objectName: "typeSelector"
+                    delegate: OptionSelectorDelegate {
+                        showDivider: false
+                        objectName: "type_" + Editor.indexToType(index)
                     }
-                }
-            }
-
-            GridLayout {
-                id: theGrid
-                columns: 2
-                columnSpacing: units.gu(1)
-                rowSpacing: units.gu(1)
-                anchors{
-                    right: parent.right
-                    left:parent.left
-                }
-
-                Label {
-                    //TRANSLATORS: %1 is either i18n.tr("Internet") or i18n.tr("MMS")
-                    text: i18n.tr("%1 APN").arg(d.typeText)
-                }
-                TextField {
-                    id: apnName
-                    enabled: !doBoth.checked
-                    onTextChanged: d.validateFields()
-                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-
-                Label {
+                    width: parent.width
+                    KeyNavigation.tab: name
+                }
+            }
+
+            // Name controls
+            Column {
+                anchors { left: parent.left; right: parent.right; }
+
+                SettingsItemTitle {
+                    anchors { left: parent.left; right: parent.right }
+                    text: i18n.tr("Name")
+                }
+
+                LocalComponents.LabelTextField {
+                    id: name
+                    objectName: "name"
+                    inputMethodHints: Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText
+                    placeholderText: i18n.tr("Enter a name describing the APN")
+                    next: accessPointName
+                    Component.onCompleted: forceActiveFocus()
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        name)
+                }
+            }
+
+            // APN controls
+            Column {
+                anchors { left: parent.left; right: parent.right; }
+
+                SettingsItemTitle {
+                    anchors { left: parent.left; right: parent.right }
+                    /* TRANSLATORS: This string is a description of a text
+                    field and should thus be concise. */
+                    text: i18n.tr("APN")
+                }
+
+                LocalComponents.LabelTextField {
+                    id: accessPointName
+                    objectName: "accessPointName"
+                    inputMethodHints: Qt.ImhUrlCharactersOnly |
+                                      Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText
+                    placeholderText: i18n.tr("Enter the name of the access point")
+                    next: isMms || isCombo ? messageCenter : username
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        accessPointName)
+                }
+            }
+
+            // MMSC controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+                visible: isMms || isCombo
+
+                SettingsItemTitle {
+                    anchors { left: parent.left; right: parent.right }
                     text: i18n.tr("MMSC")
-                    visible: d.isMms
-                }
-                TextField {
-                    id: mmsc
-                    visible: d.isMms
-                    onTextChanged: d.validateFields()
-                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-                Label {
+                }
+
+                LocalComponents.LabelTextField {
+                    id: messageCenter
+                    objectName: "messageCenter"
+                    inputMethodHints: Qt.ImhUrlCharactersOnly |
+                                      Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText
+                    placeholderText: i18n.tr("Enter message center")
+                    next: messageProxy
+                    onFocusChanged: {
+                        if (!focus && text.length > 0) {
+                            text = Editor.setHttp(text);
+                        }
+                        if (activeFocus) Editor.makeMeVisible(messageCenter);
+                    }
+                }
+            }
+
+            // Proxy controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+                visible: isMms || isCombo
+
+                SettingsItemTitle {
+                    anchors { left: parent.left; right: parent.right }
                     text: i18n.tr("Proxy")
-                    visible: d.isMms
-                }
-                TextField {
-                    id: proxy
-                    visible: d.isMms
-                    onTextChanged: d.validateFields()
-                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-                Label {
-                    text: i18n.tr("Port")
-                    visible: d.isMms
-                }
-                TextField {
+                }
+
+                LocalComponents.LabelTextField {
+                    id: messageProxy
+                    objectName: "messageProxy"
+                    inputMethodHints: Qt.ImhUrlCharactersOnly |
+                                      Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText
+                    placeholderText: i18n.tr("Enter message proxy")
+                    next: port
+                    onTextChanged: {
+                        movePortDelay.running = false;
+                        if (text.search(/\:\d+$/) >= 0) {
+                            movePortDelay.running = true;
+                        }
+                    }
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        messageProxy)
+                }
+
+                Timer {
+                    id: movePortDelay
+                    interval: 1000
+                    onTriggered: {
+
+                        function getPort(s) {
+                            var match = s.match(/\:(\d+)/);
+                            if (match === null) {
+                                return null;
+                            } else {
+                                return match[1];
+                            }
+                        }
+
+                        var prt = getPort(messageProxy.text);
+                        var portIndex = messageProxy.text.indexOf(prt);
+                        var textSansPort = messageProxy.text.slice(0, portIndex - 1);
+
+                        if (prt) {
+                            messageProxy.text = textSansPort;
+                            port.text = prt;
+                        }
+                    }
+                }
+            }
+
+            // Proxy port controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+                visible: isMms || isCombo
+
+                SettingsItemTitle {
+                    id: portLabel
+                    text: i18n.tr("Proxy port")
+                }
+
+                LocalComponents.LabelTextField {
                     id: port
-                    visible: d.isMms
-                    maximumLength: 4
-                    onTextChanged: d.validateFields()
-                    inputMethodHints: Qt.ImhDigitsOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-
-                Label {
-                    text: i18n.tr("Username")
-                }
-                TextField {
-                    id: userName
-                    enabled: !doBoth.checked
-                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-
-                Label {
+                    objectName: "port"
+                    maximumLength: 5
+                    inputMethodHints: Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText
+                    validator: portValidator
+                    placeholderText: i18n.tr("Enter message proxy port")
+                    next: username
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        port)
+                }
+
+                RegExpValidator {
+                    id: portValidator
+                    regExp: /([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])/
+                }
+            }
+
+            // Username controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+
+                SettingsItemTitle {
+                    width: parent.width
+                    text: i18n.tr("User name")
+                }
+
+                LocalComponents.LabelTextField {
+                    id: username
+                    objectName: "username"
+                    inputMethodHints: Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText |
+                                      Qt.ImhSensitiveData
+                    placeholderText: i18n.tr("Enter username")
+                    next: password
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        username)
+                }
+            }
+
+            // Password controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+
+                SettingsItemTitle {
+                    width: parent.width
                     text: i18n.tr("Password")
                 }
-                TextField {
-                    id: pword
-                    enabled: !doBoth.checked
-                    inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
-                }
-                /// @todo support for ipv6 will be added after RTM
-            }
-
-            Item {
-                id: buttonRectangle
-
-                height: cancelButton.height + units.gu(2)
-
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                }
-
-                Button {
-                    id: cancelButton
-
-                    text: i18n.tr("Cancel")
-
-                    anchors {
-                        left: parent.left
-                        right: parent.horizontalCenter
-                        bottom: parent.bottom
-                        topMargin: units.gu(1)
-                        rightMargin: units.gu(1)
-                        bottomMargin: units.gu(1)
-                    }
-
-                    onClicked: {
-                        pageStack.pop()
-                    }
-                }
-
-                Button {
-                    id: confirmButton
-
-                    text: d.isMms ? i18n.tr("Save") : i18n.tr("Activate")
-
-                    anchors {
-                        left: parent.horizontalCenter
-                        right: parent.right
-                        bottom: parent.bottom
-                        topMargin: units.gu(1)
-                        leftMargin: units.gu(1)
-                        rightMargin: units.gu(4)
-                        bottomMargin: units.gu(1)
-                    }
-
-                    enabled: d.isValid;
-
-                    onClicked: {
-                        var ctx;
-                        var values;
-
-                        if (d.isMms)
-                            ctx = contexts["mms"];
-                        else
-                            ctx = contexts["internet"];
-
-                        /// @bug LP(:#1362795)
-                        if (d.isMms && ctx === undefined) {
-                            var mmsData = ({})
-                            mmsData["accessPointName"] = apnName.text;
-                            mmsData["username"] = userName.text;
-                            mmsData["password"] = pword.text;
-                            mmsData["messageCenter"] = mmsc.text
-                            var proxyValue = "";
-                            if (proxy.text !== "") {
-                                proxyValue = proxy.text;
-                                if (port.text !== "")
-                                    proxyValue = proxyValue + ":" + port.text;
-                            }
-                            mmsData["messageProxy"] = proxyValue;
-                            activateCb("mms", undefined, mmsData);
-                            pageStack.pop();
-                            return;
-                        }
-
-                        values = {
-                            'accessPointName': apnName.text,
-                            'username': userName.text,
-                            'password': pword.text
-                        };
-
-                        if (d.isMms) {
-                            values['messageCenter'] = mmsc.text;
-                            var proxyValue = "";
-                            if (proxy.text !== "") {
-                                proxyValue = proxy.text;
-                                if (port.text !== "")
-                                    proxyValue = proxyValue + ":" + port.text;
-                            }
-                            values['messageProxy'] = proxyValue;
-                        }
-
-                        // If we are editing an existing context, update
-                        // its values, activate and exit.
-                        if (ctx) {
-                            APN.updateContext(ctx, values);
-                            activateCb(ctx.type, ctx.contextPath);
-                            pageStack.pop();
-                        } else {
-                            // If we do not have a context, create one and defer
-                            // editing it to when it has been created—and we
-                            // will also wait until Ofono has given it a name.
-                            // This is all very async, so we will use connect()
-                            // and dynamic QML.
-
-                            function addedCustomContext (path) {
-                                // This is a handler for when we add a context
-                                // in the custom apn editor.
-                                // We create a temporary QML object for the
-                                // context like this, until we get the APN
-                                // editor refactored.
-                                // TODO(jgdx): create some kind of libqofono
-                                // objects framework in apn.js
-                                var newCtx = Qt.createQmlObject(
-                                    'import MeeGo.QOfono 0.2;'+
-                                    'OfonoContextConnection {'+
-                                    'contextPath: "'+path+'" }',
-                                    root, "apn.js");
-
-                                // Ofono sets a default name (Internet or MMS).
-                                // We are going to change it to our default name.
-                                newCtx.nameChanged.connect(function (name) {
-                                    if (name === "Internet") {
-                                        newCtx.name = APN.CUSTOM_INTERNET_CONTEXT_NAME();
-                                        APN.updateContext(newCtx, values);
-                                    } else if (name === "MMS") {
-                                        newCtx.name = APN.CUSTOM_MMS_CONTEXT_NAME();
-                                        APN.updateContext(newCtx, values);
-                                    } else {
-                                        newCtx.destroy(100);
-                                        activateCb(newCtx.type, newCtx.contextPath);
-                                        pageStack.pop();
-                                    }
-                                });
-                            }
-
-                            sim.connMan.addContext(root.type);
-                            sim.connMan.contextAdded.connect(addedCustomContext);
-                        }
-                    }
-                }
-            } // item for buttons
-        } // the contents
-    } // the flickable
+
+                LocalComponents.LabelTextField {
+                    id: password
+                    objectName: "password"
+                    width: parent.width
+                    echoMode: TextInput.Normal
+                    inputMethodHints: Qt.ImhNoAutoUppercase |
+                                      Qt.ImhNoPredictiveText |
+                                      Qt.ImhSensitiveData
+                    placeholderText: i18n.tr("Enter password")
+                    next: name
+                    onActiveFocusChanged: if (activeFocus) Editor.makeMeVisible(
+                        password)
+                }
+            }
+
+            // Authentication controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+                visible: showAllUI
+
+                SettingsItemTitle {
+                    width: parent.width
+                    text: i18n.tr("Authentication")
+                }
+
+                ListItem.ItemSelector {
+                    model: [i18n.tr("None"),
+                            i18n.tr("PAP or CHAP"),
+                            i18n.tr("PAP only"),
+                            i18n.tr("CHAP only")]
+                }
+            }
+
+            // Protocol controls
+            Column {
+                anchors { left: parent.left; right: parent.right }
+                visible: showAllUI
+
+                SettingsItemTitle {
+                    width: parent.width
+                    text: i18n.tr("Protocol")
+                }
+
+                ListItem.ItemSelector {
+                    model: [i18n.tr("IPv4"),
+                            i18n.tr("IPv6"),
+                            i18n.tr("IPv4v6")]
+                }
+            }
+        }
+    } // main column holding all controls and buttons
+
+    Timer {
+        id: updateContext
+        property OfonoContextConnection ctx
+        interval: 1500
+        onTriggered: {
+            Editor.updateContextQML(ctx);
+            root.saved();
+        }
+    }
+
+    LocalComponents.KeyboardRectangle {
+        id: keyboard
+        anchors.bottom: parent.bottom
+        onHeightChanged: {
+            if (root.activeItem) {
+                Editor.makeMeVisible(root.activeItem);
+            }
+        }
+    }
 }
 
=== modified file 'plugins/cellular/PageChooseApn.qml'
--- plugins/cellular/PageChooseApn.qml	2015-03-27 15:01:01 +0000
+++ plugins/cellular/PageChooseApn.qml	2015-07-27 14:21:15 +0000
@@ -3,7 +3,8 @@
  *
  * Copyright (C) 2014 Canonical Ltd.
  *
- * Contact: Pat McGowan <[e-mail]>
+ * Contact: Pat McGowan <[e-mail]>,
+ *          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
@@ -16,15 +17,20 @@
  *
  * You should have received a copy of the GNU General Public License along
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Note: Everything user facing refers to APN and e.g. LTE, but in the
+ * code an APN configuration is a 'context' and LTE is 'ia'.
+ *
  */
 
 import QtQuick 2.0
 import SystemSettings 1.0
 import Ubuntu.Components 1.1
-import Ubuntu.Components.Popups 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components.ListItems 1.0 as ListItem
 import MeeGo.QOfono 0.2
 import Ubuntu.SystemSettings.Cellular 1.0
+import "apn_manager.js" as Manager
 
 ItemPage {
     id: root
@@ -32,548 +38,340 @@
     objectName: "apnPage"
 
     property var sim
-
-    QtObject {
-        id: d
-
-        // map of contextPath : connCtx
-        property var mContexts: ({})
-
-        readonly property string mCustomContextNameInternet: "___ubuntu_custom_apn_internet"
-        readonly property string mCustomContextNameMms: "___ubuntu_custom_apn_mms"
-        property var mCustomContextInternet : undefined
-        property var mCustomContextMms : undefined
-
-        // LP(:#1362795)
-        property var pendingCustomMmsData : ({})
-
-        // suppress any actions that we don't want to take
-        // when updating selectedIndexes, etc
-        property bool __suppressActivation : true;
-        property bool __haveCustomContexts : false;
-
-        function updateContexts(contexts)
-        {
-            var tmp = contexts || sim.connMan.contexts.slice(0);
-            var added = tmp.filter(function(i) {
-                return mContexts[i] === undefined;
-            });
-            var removed = Object.keys(mContexts).filter(function(i) {
-                return tmp.indexOf(i) === -1;
-            })
-
-            removed.forEach(function(currentValue, index, array) {
-                // just asserting to verify the logic
-                // remove once proven functional
-                // the exception gives a very nice log error message from QmlEngine and does not
-                // have any side effects
-                if (mContexts[currentValue] === undefined) {
-                    throw "updateContexts: removed is broken";
-                }
-
-                if (mContexts[currentValue].name === mCustomContextNameInternet)
-                    mCustomContextInternet = undefined
-                else if (mContexts[currentValue].name === mCustomContextNameMms)
-                    mCustomContextMms = undefined
-
-                mContexts[currentValue].destroy();
-                delete mContexts[currentValue];
-            });
-
-            added.forEach(function(currentValue, index, array) {
-                // just asserting to verify the logic
-                // remove once proven functional
-                // the exception gives a very nice log error message from QmlEngine and does not
-                // have any side effects
-                if (mContexts[currentValue] !== undefined) {
-                    throw "updateContexts: added is broken";
-                }
-                var ctx = connCtx.createObject(parent,
-                                               {
-                                                   "contextPath": currentValue
-                                               });
-                mContexts[currentValue] = ctx;
-            });
-
-            // just asserting to verify the logic
-            // remove once proven functional
-            // the exception gives a very nice log error message from QmlEngine and does not
-            // have any side effects
-            if (Object.keys(mContexts).length !== tmp.length) {
-                throw "Object.keys(contexts).length !== tmp.length";
-            }
-            tmp.forEach(function(currentValue, index, array) {
-                if (mContexts[currentValue] === undefined)
-                    throw "contexts[currentValue] === undefined";
-            });
-
-            buildLists();
-        }
-
-        // expects updateContexts() to have ran before executing.
-        function checkAndCreateCustomContexts() {
-
-            // When a context is added, we assume it is a custom one.
-            function addedCustomContext (path) {
-
-                // We do not have a QML object representing this context,
-                // so we ask updateContexts to create one.
-                if (!d.mContexts[path]) {
-                    d.updateContexts();
-                }
-                d.mContexts[path].name = mCustomContextNameInternet;
-                sim.connMan.contextAdded.disconnect(addedCustomContext);
-            }
-
-            var customInternet = Object.keys(mContexts).filter(function (i) {
-                var ctx = mContexts[i];
-                return ctx.name === mCustomContextNameInternet;
-            });
-            var customMms = Object.keys(mContexts).filter(function (i) {
-                var ctx = mContexts[i];
-                return ctx.name === mCustomContextNameMms;
-            });
-
-            // make sure there is only one context per type
-            if (customInternet.length > 1) {
-                customInternet.forEach(function(currentValue, index, array) {
-                   if (index === 0)
-                       return;
-                   sim.connMan.removeContext(currentValue);
-                });
-            }
-            if (customMms.length > 1) {
-                customMms.forEach(function(currentValue, index, array) {
-                   if (index === 0)
-                       return;
-                   sim.connMan.removeContext(currentValue);
-                });
-            }
-
-            if (customInternet.length !== 0) {
-                d.__haveCustomContexts = true;
-            }
-
-            // @bug don't create the custom MMS context
-            //      LP(:#1362795)
-            // if (customMms.length === 0) {
-            //     sim.connMan.addContext("mms");
-            // }
-
-            buildLists();
-        }
-
-        property var mInternetApns : [];
-        property var mMmsApns : [];
-        function buildLists()
-        {
-            d.__suppressActivation = true;
-
-            var internet = [];
-            var mms = [];
-
-            internet = Object.keys(mContexts).filter(function(i) {
-                var ctx = mContexts[i];
-                if (ctx.type === "internet") {
-                    if (ctx.name === mCustomContextNameInternet) {
-                        mCustomContextInternet = ctx
-                        // don't add yet
-                        return false;
-                    }
-                    return true;
-                }
-                return false;
-            });
-            mms = Object.keys(mContexts).filter(function(i) {
-                var ctx = mContexts[i];
-                if ( ctx.type === "mms") {
-                    if (ctx.name === mCustomContextNameMms) {
-                        mCustomContextMms = ctx;
-                        // don't add yet
-                        return false;
-                    }
-                    return true;
-                }
-                return false;
-            });
-
-            // make sure customized are the last on the lists
-            if (mCustomContextInternet !== undefined)
-                internet = internet.concat([mCustomContextInternet.contextPath])
-            if (mCustomContextMms !== undefined)
-                mms = mms.concat([mCustomContextMms.contextPath])
-            else {
-                /// @bug LP(#1361864)
-                // add anyway a "dummy" Custom so we can show at least the one provisioned
-                // MMS context as long as the user does not hit "Custom" in the MMS list.
-                mms = mms.concat(["dummycustom"])
-            }
-
-            // add "Same APN as for Internet" to be the first on the MMS list
-            mms = ["/same/as/internet"].concat(mms);
-
-            mInternetApns = internet;
-            mMmsApns = mms;
-
-            internetApnSelector.updateSelectedIndex();
-
-            d.__suppressActivation = false;
-        }
-
-        function openApnEditor(type) {
-            var ctx;
-            if (type === "internet") {
-                ctx = mCustomContextInternet;
-            } else if (type == "mms") {
-                ctx = mCustomContextMms;
-            }
-            /// can't modify active context
-            if (ctx !== undefined && ctx.active)
-                ctx.active = false;
-
-            pageStack.push(Qt.resolvedUrl("CustomApnEditor.qml"),
-                           {
-                               type: type,
-                               contexts: {"internet": mCustomContextInternet,
-                                          "mms":      mCustomContextMms},
-                               activateCb: activateHelper,
-                               sim: sim
-                           });
-        }
-
-        function activateHelper(type, contextPath, customMmsData) {
-            if (type === "internet") {
-                activator.activate(contextPath, sim.simMng.subscriberIdentity, sim.simMng.modemPath)
-            }
-            else if (type === "mms") {
-                if (contextPath === undefined) {
-                    // LP(:#1362795)
-                    pendingCustomMmsData = customMmsData
-                    /// remove any provisioned ones..
-                    var remove = []
-                    Object.keys(mContexts).forEach(function(currentValue, index, array) {
-                        var ctx = mContexts[currentValue];
-                        if (ctx.type === "mms")
-                            remove = remove.concat([ctx.contextPath])
-                    });
-                    remove.forEach(function(currentValue, index, array) {
-                        sim.connMan.removeContext(currentValue);
-                    });
-                    sim.connMan.addContext("mms")
-                }
-            } else {
-                // somebody is calling the function wrong
-                // the exception gives a very nice log error message from QmlEngine and does not
-                // have any side effects
-                throw "activateHelper: bad data: type: " + type + ", contextPath: " + contextPath + ", customMmsData: " + customMmsData;
-            }
-        }
-    }
-
-    OfonoActivator {
-        id:activator
+    property var editor
+
+    // Signal that indicates that we have all our contexts.
+    signal ready()
+    Component.onCompleted: root.ready.connect(Manager.ready)
+
+    /**
+     * We have three ListModels: one for Internet contexts, one for MMS
+     * contexts and one for ia contexts. We use OfonoContextConnection qml
+     * objects to represents the contexts.
+     *
+     * The model will have helpful properties:
+     *     title: Title that goes in the editor.
+     *     type: A code that tells us what context type this model will have.
+     *
+     * Model objects will have the following roles:
+     *     path: the path of the context
+     *     qml: the QML of the context
+     */
+
+    ListModel {
+        id: mmsContexts
+        property string title: i18n.tr("MMS APN")
+        property string type: 'mms'
+    }
+
+    ListModel {
+        id: internetContexts
+        property string title: i18n.tr("Internet APN")
+        property string type: 'internet'
+    }
+
+    ListModel {
+        id: iaContexts
+        property string title: i18n.tr("LTE APN")
+        property string type: 'ia'
     }
 
     Component {
-        id: connCtx
+        id: contextComponent
         OfonoContextConnection {
-
-            // add helper property to detect dual internet/MMS contexts
-            property bool dual : false
-            onTypeChanged:{
-                if (type == "internet")
-                    if (messageCenter !== "")
-                        dual = true
-
-                d.buildLists();
-            }
-
-            onActiveChanged: if (type === "internet") internetApnSelector.updateSelectedIndex()
-            onNameChanged: {
-
-                if (name === d.mCustomContextNameInternet) {
-                    d.__haveCustomContexts = true;
-                }
-
-                if (name === "MMS") {
-                    this.name = d.mCustomContextNameMms;
-                    this.accessPointName = d.pendingCustomMmsData["accessPointName"];
-                    this.username = d.pendingCustomMmsData["username"];
-                    this.password = d.pendingCustomMmsData["password"];
-                    this.messageCenter = d.pendingCustomMmsData["messageCenter"];
-                    this.messageProxy = d.pendingCustomMmsData["messageProxy"];
-                    d.pendingCustomMmsData = ({});
-                }
-                d.buildLists();
-            }
-            onAccessPointNameChanged: d.buildLists()
-            onReportError: console.error("Context error on " + contextPath + ": " + errorString)
-        }
-    }
-
-    Connections {
-        target: sim.connMan
-        onContextsChanged: d.updateContexts(contexts)
-        Component.onCompleted: {
-            /// @todo workaround the work around that the UI currently only supports max. 1 MMS context
-            ///       remove once nuntium stuff is implemented
-            // remove all but one MMS context
-            var mms = Object.keys(d.mContexts).filter(function(i) {
-                var ctx = d.mContexts[i]
-                if (ctx.type === "mms")
-                        return true;
-                return false;
-            });
-            mms = mms.slice(1);
-            mms.forEach(function(currentValue, index, array) {
-                sim.connMan.removeContext(currentValue);
-            });
-
-            d.updateContexts();
-        }
-    }
+            property bool isCombined: type === 'internet' && messageCenter
+            property string typeString: {
+                if (isCombined) {
+                    return i18n.tr("Internet and MMS");
+                } else if (type === 'internet' && !messageCenter) {
+                    return i18n.tr("Internet");
+                } else if (type === 'ia') {
+                    return i18n.tr("LTE");
+                } else if (type === 'mms') {
+                    return i18n.tr("MMS");
+                } else {
+                    return type;
+                }
+            }
+        }
+    }
+
+    state: "default"
+    states: [
+        PageHeadState {
+            name: "default"
+            head: root.head
+            actions: [
+                Action {
+                    iconName: "add"
+                    objectName: "newApn"
+                    onTriggered: {
+                        editor = pageStack.push(Qt.resolvedUrl("PageApnEditor.qml"), {
+                            manager:         Manager,
+                            mmsModel:        mmsContexts,
+                            internetModel:   internetContexts,
+                            iaModel:         iaContexts
+                        });
+                    }
+                }
+            ]
+        }
+    ]
 
     Flickable {
         id: scrollWidget
         anchors.fill: parent
+        contentWidth: parent.width
         contentHeight: contentItem.childrenRect.height
-        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
-        flickableDirection: Flickable.VerticalFlick
-
+        boundsBehavior: (contentHeight > root.height) ?
+            Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
         Column {
-            anchors { left: parent.left; right: parent.right }
-
-            spacing: units.gu(2)
-
-            ListItem.ItemSelector {
-                id: internetApnSelector
-                width: parent.width
-                model: d.mInternetApns
-                expanded: true
-                selectedIndex: -1
-                text: i18n.tr("Internet APN:")
-                onModelChanged: updateSelectedIndex()
-
-                function updateSelectedIndex()
-                {
-                    var tmp = d.__suppressActivation
-                    d.__suppressActivation = true;
-                    var idx = -1;
-                    if (model) {
-                        model.forEach(function(currentValue, index, array) {
-                            if (d.mContexts[currentValue].active)
-                                idx = index;
-                        });
-                    }
-                    selectedIndex = idx;
-                    d.__suppressActivation = tmp;
-                }
-
-                delegate: OptionSelectorDelegate {
-                    showDivider: false
-                    text: {
-                        var ctx = d.mContexts[modelData];
-                        if (ctx.name !== "") {
-                            if (ctx.name !== d.mCustomContextNameInternet) {
-                                return ctx.name
-                            } else {
-                                //: user visible name of the custom Internet APN
-                                return i18n.tr("Custom");
-                            }
-                        } else {
-                            return ctx.accessPointName
-                        }
-                    }
-                }
-                onSelectedIndexChanged: {
-                    if (selectedIndex === -1) {
-                        if (mmsApnSelector && mmsApnSelector.model[mmsApnSelector.selectedIndex] === "/same/as/internet")
-                            mmsApnSelector.selectedIndex = -1;
-                        return;
-                    }
-
-                    var ctx = d.mContexts[model[selectedIndex]];
-                    if(ctx.dual) {
-                        if (!d.mCustomContextMms)
-                            mmsApnSelector.selectedIndex = mmsApnSelector.model.indexOf("/same/as/internet");
-                    }
-                    else if (mmsApnSelector.model[mmsApnSelector.selectedIndex] === "/same/as/internet")
-                        mmsApnSelector.selectedIndex = -1;
-
-                    if (d.__suppressActivation)
-                        return;
-
-                    if (d.mCustomContextInternet && model[selectedIndex] === d.mCustomContextInternet.contextPath) {
-                        if (d.mCustomContextInternet.accessPointName === "") {
-                            d.openApnEditor("internet");
-                            updateSelectedIndex();
-                            return;
-                        }
-                    }
-
-                    d.activateHelper("internet", ctx.contextPath);
-                }
-            }
-
-
-            Button {
-                anchors { horizontalCenter: parent.horizontalCenter }
-                objectName: "customApnEdit"
-                text: i18n.tr("Custom Internet APN…")
-                width: parent.width - units.gu(4)
-                onClicked: d.openApnEditor("internet")
-            }
-
-            ListItem.ItemSelector {
-                id: mmsApnSelector
-                width: parent.width
-                model: d.mMmsApns
-                expanded: true
-                selectedIndex: -1
-                text: i18n.tr("MMS APN:")
-                delegate: OptionSelectorDelegate {
-                    showDivider: modelData === "/same/as/internet"
-                    enabled: {
-                        if (modelData !== "/same/as/internet")
-                            return true;
-                        else {
-                            var tmp = d.mContexts[internetApnSelector.model[internetApnSelector.selectedIndex]]
-                            return tmp === undefined ? false : tmp.dual
-                        }
-                    }
-                    // work around OptionSelectorDelegate not having a visual change depending on being disabled
-                    opacity: enabled ? 1.0 : 0.5
-                    text: {
-                        if (modelData === "/same/as/internet") {
-                            return i18n.tr("Same APN as for Internet");
-                        }
-                        if (modelData === "dummycustom") {
-                            return i18n.tr("Custom");
-                        }
-                        var ctx = d.mContexts[modelData];
-                        if (ctx.name !== "") {
-                            if (ctx.name !== d.mCustomContextNameMms) {
-                                return ctx.name
-                            } else {
-                                //: user visible name of the custom MMS APN
-                                return i18n.tr("Custom");
-                            }
-                        } else {
-                            return ctx.accessPointName
-                        }
-                    }
-                }
-                onModelChanged: updateSelectedIndex();
-                function updateSelectedIndex()
-                {
-                    // if we have custom MMS context, it must be active.
-                    // @bug LP(#1361864)
-                    var tmp = d.__suppressActivation;
-                    d.__suppressActivation = true;
-                    if (d.mCustomContextMms) {
-                        selectedIndex = model.indexOf(d.mCustomContextMms.contextPath);
-                    } else if (model.length === 3) {
-                        /* meaning we have:
-                         * 0 - /same/as/internet
-                         * 1 - some provisioned one
-                         * 2 - dummycustom
-                         */
-                        selectedIndex = 1;
-                    } else if (internetApnSelector.model && internetApnSelector.selectedIndex !== -1) {
-                        if (d.mContexts[internetApnSelector.model[internetApnSelector.selectedIndex]].dual) {
-                            selectedIndex = model.indexOf("/same/as/internet");
-                        } else
-                            selectedIndex = -1;
-                    } else {
-                        selectedIndex = -1;
-                    }
-                    d.__suppressActivation = tmp;
-                }
-
-                onSelectedIndexChanged: {
-                    if (selectedIndex === -1 || d.__suppressActivation)
-                        return;
-
-                    if (model[selectedIndex] === "/same/as/internet") {
-                        // @bug delete _any_ actual MMS context
-                        //      LP:(#1362795)
-                        var remove = [];
-                        Object.keys(d.mContexts).forEach(function(currentValue, index, array) {
-                            var ctx = d.mContexts[currentValue];
-                            if (ctx.type === "mms")
-                                remove = remove.concat([ctx.contextPath]);
-                        });
-                        remove.forEach(function(currentValue, index, array) {
-                            sim.connMan.removeContext(currentValue);
-                        });
-                        return;
-                    }
-
-                    if (model[selectedIndex] === "dummycustom") {
-                        d.openApnEditor("mms");
-                        updateSelectedIndex()
-                        return;
-                    }
-
-                    // no need to "activate" anything.
-                    // just fall through return here.
-                    // once we actually are able to suppport multiple MMS contexts
-                    // on the system, add some code here to set one of them active
-                }
-            }
-
-            Button {
-                anchors { horizontalCenter: parent.horizontalCenter }
-                objectName: "customApnEdit"
-                text: i18n.tr("Custom MMS APN…")
-                width: parent.width - units.gu(4)
-                onClicked: {
-                    if (!d.__haveCustomContexts) {
-                        d.checkAndCreateCustomContexts();
-                        d.__haveCustomContexts = true;
-                    }
-                    d.openApnEditor("mms");
-                }
-            }
-
-            // @todo: no means of doing any meaningful reset right now.
-            // LP(#1338758)
-            // ListItem.ThinDivider {}
-            // ListItem.SingleControl {
-            //     control: Button {
-            //         objectName: "resetButton"
-            //         text: i18n.tr("Reset APN Settings")
-            //         width: parent.width - units.gu(4)
-            //         onClicked: {
-            //             PopupUtils.open(resetDialog)
-            //         }
-            //     }
-            // }
-        }
-    }
-
-    Component {
-         id: resetDialog
-         Dialog {
-             id: dialogue
-             title: i18n.tr("Reset APN Settings")
-             text: i18n.tr("Are you sure that you want to Reset APN Settings?")
-             Button {
-                 text: i18n.tr("Cancel")
-                 onClicked: PopupUtils.close(dialogue)
-             }
-             Button {
-                 text: i18n.tr("Reset")
-                 color: UbuntuColors.orange
-                 onClicked: {
-                     // delete all APNs
-                     // kick ofono per
-                     // https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1338758
-
-                 }
-             }
-
-         }
+            id: apnsCol
+            anchors { left: parent.left; right: parent.right }
+
+            Repeater {
+                id: apns
+                anchors { left: parent.left; right: parent.right }
+                height: childrenRect.height
+                model: [internetContexts, mmsContexts, iaContexts]
+                delegate: apnsDelegate
+            }
+        }
+
+        Button {
+            anchors {
+                top: apnsCol.bottom
+                right: parent.right
+                left: parent.left
+                margins: units.gu(2)
+            }
+            text: i18n.tr("Reset All APN Settings…")
+            onClicked: PopupUtils.open(resetDialog)
+        }
+    }
+
+    Component {
+        id: resetDialog
+        Dialog {
+            id: dialogue
+            title: i18n.tr("Reset APN Settings")
+            text: i18n.tr("Are you sure that you want to Reset APN Settings?")
+
+            Button {
+                text: i18n.tr("Reset")
+                color: UbuntuColors.orange
+                onClicked: {
+                    Manager.reset();
+                    PopupUtils.close(dialogue);
+                }
+            }
+
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Component {
+        id: disablesInternetWarning
+        Dialog {
+            id: dialogue
+            property OfonoContextConnection mms
+            property OfonoContextConnection combined
+            /* TRANSLATORS: %1 is the MMS APN that the user has chosen to be
+            “preferred”. */
+            title: i18n.tr("Prefer %1").arg(mms.name)
+            /* TRANSLATORS: %1 is the MMS APN that the user has chosen to be
+            “preferred”, i.e. used to retrieve MMS messages. %2 is the Internet
+            APN that will be “de-preferred” as a result of this action. */
+            text: i18n.tr("You have chosen %1 as your preferred MMS APN. " +
+                          "This disconnects an Internet connection provided " +
+                          "by %2.").arg(mms.name).arg(combined.name)
+
+            Button {
+                text: i18n.tr("Disconnect")
+                onClicked: {
+                    Manager.setPreferred(mms, true, true);
+                    PopupUtils.close(dialogue);
+                }
+            }
+
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Component {
+        id: disablesMMSWarning
+        Dialog {
+            id: dialogue
+            property OfonoContextConnection internet
+            property OfonoContextConnection combined
+            /* TRANSLATORS: %1 is the Internet APN that the user has chosen to
+            be “preferred”. */
+            title: i18n.tr("Prefer %1").arg(internet.name)
+            /* TRANSLATORS: %1 is the Internet APN that the user has chosen to
+            be “preferred”, i.e. used to connect to the Internet. %2 is the MMS
+            APN that will be “de-preferred” as a result of this action. */
+            text: i18n.tr("You have chosen %1 as your preferred Internet APN. " +
+                          "This disables the MMS configuration provided " +
+                          "by %2.").arg(internet.name).arg(combined.name)
+
+            Button {
+                text: i18n.tr("Disable")
+                onClicked: {
+                    Manager.setPreferred(internet, true, true);
+                    PopupUtils.close(dialogue);
+                }
+            }
+
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Component {
+        id: disableContextWarning
+        Dialog {
+            id: dialogue
+            property OfonoContextConnection context
+            /* TRANSLATORS: %1 is the APN that the user has disconnected or
+            disabled. */
+            title: context.type === 'internet' ?
+                i18n.tr("Disconnect %1").arg(context.name) :
+                i18n.tr("Disable %1").arg(context.name)
+
+            /* TRANSLATORS: %1 is the APN that the user has disconnected or
+            disabled. */
+            text: context.type === 'internet' ?
+                i18n.tr("This disconnects %1.").arg(context.name) :
+                i18n.tr("This disables %1.").arg(context.name)
+
+            Button {
+                text: context.type === 'mms' ?
+                    i18n.tr("Disable") :
+                    i18n.tr("Disconnect")
+                onClicked: {
+                    Manager.setPreferred(context, false, true);
+                    PopupUtils.close(dialogue);
+                }
+            }
+
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
+    Component {
+        id: apnsDelegate
+
+        Repeater {
+            anchors { left: parent.left; right: parent.right }
+            model: modelData
+            delegate: apnDelegate
+        }
+    }
+
+    Component {
+        id: apnDelegate
+
+        ListItem.Standard {
+            id: apnListItem
+            property alias text: apnItemName.text
+            objectName: "edit_" + qml.name
+            height: units.gu(6)
+            removable: true
+            confirmRemoval: true
+            progression: true
+
+            onItemRemoved: Manager.removeContext(path);
+            onClicked: {
+                editor = pageStack.push(Qt.resolvedUrl("PageApnEditor.qml"), {
+                    manager:         Manager,
+                    contextQML:      qml,
+                    mmsModel:        mmsContexts,
+                    internetModel:   internetContexts,
+                    iaModel:         iaContexts
+                });
+            }
+
+            control: CheckBox {
+                id: check
+                objectName: qml.name + "_preferred"
+                property bool serverChecked: qml && qml.preferred
+                onServerCheckedChanged: checked = serverChecked
+                Component.onCompleted: checked = serverChecked
+                onTriggered: Manager.setPreferred.call(this, qml, checked)
+            }
+
+            Item  {
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                }
+
+                Label {
+                    id: apnItemName
+                    anchors {
+                        topMargin: units.gu(1)
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    text: qml.name
+                    elide: Text.ElideRight
+                    opacity: apnListItem.enabled ? 1.0 : 0.5
+                }
+
+                Label {
+                    id: apnItemType
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: apnItemName.bottom
+                    }
+
+                    text: qml.typeString
+                    color: Theme.palette.normal.backgroundText
+                    fontSize: "small"
+                    wrapMode: Text.Wrap
+                    maximumLineCount: 5
+                }
+            }
+        }
+    }
+
+    Connections {
+        target: sim.connMan
+
+        onContextAdded: Manager.contextAdded(path)
+        onContextRemoved: Manager.contextRemoved(path)
+        onContextsChanged: Manager.contextsChanged(contexts)
+        onReportError: Manager.reportError(message)
+        Component.onCompleted: Manager.contextsChanged(sim.connMan.contexts)
+    }
+
+    // We set the target to be ConnMan before we want to call 'ResetContexts' on
+    // ConnMan. When ConnMan powers down, the connManPoweredChanged handler is
+    // called and call 'ResetContexts'. This is because we can't make this call
+    // while ConnMan is 'Powered'. After the 'ResetContexts' call is done,
+    // the target is reset to null.
+    Connections {
+        id: restorePowered
+        target: null
+        ignoreUnknownSignals: true
+        onPoweredChanged: Manager.connManPoweredChanged(powered)
     }
 }
 
=== added file 'plugins/cellular/apn_editor.js'
--- plugins/cellular/apn_editor.js	1970-01-01 00:00:00 +0000
+++ plugins/cellular/apn_editor.js	2015-07-27 14:21:15 +0000
@@ -0,0 +1,192 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 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/>.
+ *
+ * This is a collection of functions to help the custom apn editor.
+ */
+
+/**
+ * Updates the given OfonoContextConnection by using values from the editor.
+ *
+ * @param {OfonoContextConnection} qml to be updated
+*/
+function updateContextQML (ctx) {
+    var toType = indexToType(typeSel.selectedIndex);
+    toType = toType === 'internet+mms' ? 'internet' : toType;
+    ctx.disconnect();
+    ctx.name = name.text;
+    ctx.type = toType;
+    ctx.accessPointName = accessPointName.text;
+    ctx.username = username.text;
+    ctx.password = password.text;
+    ctx.messageCenter = messageCenter.visible ? messageCenter.text : '';
+    ctx.messageProxy = messageProxy.visible ? messageProxy.text + (port.text ? ':' + port.text : '') : '';
+}
+
+/**
+ * Populates editor with values from a OfonoContextConnection.
+ *
+ * @param {OfonoContextConnection} qml to use as reference
+*/
+function populate (ctx) {
+    name.text = ctx.name;
+    accessPointName.text = ctx.accessPointName;
+    username.text = ctx.username;
+    password.text = ctx.password;
+    messageCenter.text = ctx.messageCenter;
+    messageProxy.text = ctx.messageProxy;
+
+    if (ctx.isCombined) {
+        typeSel.selectedIndex = typeToIndex('internet+mms');
+    } else {
+        typeSel.selectedIndex = typeToIndex(ctx.type);
+    }
+}
+
+/**
+ * Handler for when a user saves a context.
+*/
+function saving () {
+    var model;
+    var type;
+    root.saving();
+
+    // Edit or new? Create a context if it does not exist.
+    if (contextQML) {
+        updateContextQML(contextQML);
+        root.saved();
+    } else {
+        type = indexToType();
+        if (type === 'internet+mms') type = 'internet';
+        manager.createContext(type);
+    }
+}
+
+/**
+ * Handler for new contexts.
+ *
+ * @param {OfonoContextConnection} new context
+*/
+function newContext (context) {
+    // Start a timer that will update the context.
+    // Ofono and libqofono seems to be very unreliable
+    // when it comes to how a context is created,
+    // so we just wait a couple of seconds until we're
+    // sure the context exists and can be edited.
+    updateContext.ctx = context;
+    updateContext.start();
+}
+
+/**
+ * Checks whether or not a link has a http protocol prefix.
+ *
+ * @param {String} link to check
+*/
+function hasProtocol (link) {
+    return link.search(/^http[s]?\:\/\//) == -1;
+}
+
+/**
+ * Prepend http:// to a link if there isn't one.
+ *
+ * @param {String} link to add http:// to
+ * @return {String} changed link
+*/
+function setHttp (link) {
+    if (hasProtocol(link)) {
+        link = 'http://' + link;
+    }
+    return link;
+}
+
+/**
+ * Asks whether or not the values in the editor is valid or not.
+ *
+ * @return {Boolean} whether or not the editor is valid
+*/
+function isValid () {
+    if (isMms || isCombo) {
+        return name.text &&
+               accessPointName.text &&
+               messageCenter.text;
+    } else {
+        return name.text &&
+               accessPointName.text;
+    }
+}
+
+/**
+ * Given a type, this asks what index of the type selector
+ * it corresponds to.
+ *
+ * @param {String} type to check
+ * @return {Number} of index
+*/
+function typeToIndex (type) {
+    if (type === 'internet+mms') return 0;
+    if (type === 'internet') return 1;
+    if (type === 'mms') return 2;
+    if (type === 'ia') return 3;
+}
+
+/**
+ * Given an index, we ask what type this index corresponds to.
+ *
+ * @param {Number} [optional] index to check
+ * @return {String} type it corresponds to
+*/
+function indexToType (index) {
+    if (typeof index === 'undefined') {
+        index = typeSel.selectedIndex;
+    }
+    if (index === 0) return 'internet+mms';
+    if (index === 1) return 'internet';
+    if (index === 2) return 'mms';
+    if (index === 3) return 'ia';
+}
+
+function ready () {
+    _edgeReady = true;
+}
+
+function makeMeVisible(item) {
+    if (!_edgeReady || !item) {
+        return;
+    }
+
+    root.activeItem = item;
+
+    var position = scrollArea.contentItem.mapFromItem(item, 0, root.activeItem.y);
+
+    // check if the item is already visible
+    var bottomY = scrollArea.contentY + scrollArea.height;
+    var itemBottom = position.y + item.height; // extra margin
+    if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
+        return;
+    }
+
+    // if it is not, try to scroll and make it visible
+    var targetY = itemBottom - scrollArea.height;
+    if (targetY >= 0 && position.y) {
+        scrollArea.contentY = targetY;
+    } else if (position.y < scrollArea.contentY) {
+        // if it is hidden at the top, also show it
+        scrollArea.contentY = position.y;
+    }
+    scrollArea.returnToBounds();
+}
 
=== renamed file 'plugins/cellular/apn.js' => 'plugins/cellular/apn_manager.js'
--- plugins/cellular/apn.js	2015-03-26 21:57:53 +0000
+++ plugins/cellular/apn_manager.js	2015-07-27 14:21:15 +0000
@@ -1,61 +1,589 @@
-var _CUSTOM_INTERNET_CONTEXT_NAME = '___ubuntu_custom_apn_internet';
-var _CUSTOM_MMS_CONTEXT_NAME = '___ubuntu_custom_apn_mms';
-
-/*
-Updates a context with new values.
-
-@param {QOfonoConnectionContext} context
-@param {Object} values dict with new values
-*/
-function updateContext (context, values) {
-    var messageProxy;
-    console.warn('updateContext', values.accessPointName, values.messageCenter,
-        values.messageProxy, values.port, values.useraccessPointName,
-        values.password, values.type);
-    if (typeof values.accessPointName !== 'undefined') {
-        context.accessPointName = values.accessPointName;
-    }
-    if (typeof values.messageCenter !== 'undefined') {
-        context.messageCenter = values.messageCenter;
-    }
-    if (typeof values.messageProxy !== 'undefined') {
-        messageProxy = values.messageProxy;
-        if (messageProxy !== '') {
-             messageProxy = messageProxy + ':' + values.port;
-        }
-        context.messageProxy = messageProxy;
-    }
-    if (typeof values.username !== 'undefined') {
-        context.username = values.username;
-    }
-    if (typeof values.password !== 'undefined') {
-        context.password = values.password;
-    }
-    if (typeof values.type !== 'undefined') {
-        context.type = values.type;
-    }
-
-    if (context.type === 'internet') {
-        context.name = CUSTOM_INTERNET_CONTEXT_NAME();
-    } else if (context.type === 'mms') {
-        context.name = CUSTOM_MMS_CONTEXT_NAME();
-    }
-}
-
-/*
-Exposes the custom internet context name to the world.
-
-@return {String} custom internet context name
-*/
-function CUSTOM_INTERNET_CONTEXT_NAME () {
-    return _CUSTOM_INTERNET_CONTEXT_NAME;
-}
-
-/*
-Exposes the custom mms context name to the world.
-
-@return {String} custom mms context name
-*/
-function CUSTOM_MMS_CONTEXT_NAME () {
-    return _CUSTOM_MMS_CONTEXT_NAME;
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 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/>.
+ *
+ * This is a collection of functions to help dynamic creation and deletion
+ * of ofono contexts.
+ */
+
+// Map of path to QOfonoContextConnection objects
+var _pathToQml = {};
+var _totalContext = 0;
+var _validContexts = 0;
+
+/**
+ * Get the list model corresponding to a given type.
+ *
+ * @throws {Error} if the type was not mms|internet|ia
+ * @param {String} type of model to get
+ * @return {ListModel} model that matches type
+*/
+function getModelFromType (type) {
+    var model;
+    switch (type) {
+        case 'mms':
+            model = mmsContexts;
+            break;
+        case 'internet':
+        case 'internet+mms':
+            model = internetContexts;
+            break;
+        case 'ia':
+            model = iaContexts;
+            break;
+        default:
+            throw new Error('Unknown context type ' + type);
+    }
+    return model;
+}
+
+/**
+ * Get QML for a context path.
+ *
+ * @param {String} path of context
+ * @return {QOfonoContextConnection|null} qml from path or null if none found
+*/
+function getContextQML (path) {
+    if (!_pathToQml.hasOwnProperty(path)) {
+        return null;
+    } else {
+        return _pathToQml[path];
+    }
+}
+
+/**
+ * Given an array of paths, it will create and associate
+ * an QOfonoContextConnection QML object for each new path.
+ *
+ * It will also delete any QML that is not in given list of paths.
+ *
+ * @param {Array} paths, array of operator paths
+ */
+function updateQML (paths) {
+    _garbageCollect(paths);
+    _createQml(paths);
+}
+
+/**
+ * Destroys QML and makes sure to remove from the
+ * appropriate model.
+ *
+ * @param {String} path of object to delete
+ * @return {Boolean} deletion successful
+ */
+function deleteQML (path) {
+    var ctx;
+    var i;
+    if (!_pathToQml.hasOwnProperty(path)) {
+        return false;
+    } else {
+        ctx = _pathToQml[path];
+
+        [mmsContexts, internetContexts, iaContexts].forEach(function (model) {
+            for (i = 0; i < model.count; i++) {
+                if (ctx.contextPath == model.get(i).path) {
+                    model.remove(i);
+                    break;
+                }
+            }
+        });
+
+        _pathToQml[path].destroy();
+        delete _pathToQml[path];
+        return true;
+    }
+}
+
+/**
+ * Removes QML that no longer exists in list of paths.
+ *
+ * @param {Array:String} paths we use as reference.
+ */
+function _garbageCollect (paths) {
+    var path;
+    for (path in _pathToQml) {
+        if (_pathToQml.hasOwnProperty(path)) {
+            if (paths.indexOf(path) === -1) {
+                deleteQML(path);
+                _totalContext--;
+            }
+        }
+    }
+}
+
+/**
+ * Creates QML for list in paths.
+ *
+ * @param {Array:String} list of paths
+ * @param {String} path to the modem
+ */
+function _createQml (paths) {
+    var ctx;
+    paths.forEach(function (path, i) {
+        if (!_pathToQml.hasOwnProperty(path)) {
+
+            ctx = createContextQml(path);
+
+            // Some contexts have a name, others do not. Normalize this.
+            if (!ctx.name) {
+                ctx.nameChanged.connect(contextNameChanged.bind(ctx));
+            } else {
+                contextNameChanged.bind(ctx)(ctx.name);
+            }
+
+            // Some context come with a type, others not. Normalize this.
+            if (!ctx.type) {
+                ctx.typeChanged.connect(contextTypeChanged.bind(ctx));
+            } else {
+                addContextToModel(ctx);
+            }
+
+            ctx.validChanged.connect(contextValidChanged.bind(ctx));
+            ctx.activeChanged.connect(contextActiveChanged.bind(ctx));
+
+            _pathToQml[path] = ctx;
+            _totalContext++;
+        }
+    });
+}
+
+/**
+ * Creates a OfonoContextConnection qml object from a given path.
+ * Since the components are all local, this will always return an object.
+ *
+ * @param {String} path of context
+ * @return {OfonoContextConnection} qml that was created
+*/
+function createContextQml (path) {
+    if (!_pathToQml.hasOwnProperty(path)) {
+        return contextComponent.createObject(root, {
+            'contextPath': path,
+            'modemPath': sim.path
+        });
+    } else {
+        return _pathToQml[path];
+    }
+}
+
+/**
+ * Creates a context of a certain type.
+ *
+ * @param {String} type of context to be created.
+*/
+function createContext (type) {
+    sim.connMan.addContext(type);
+}
+
+/**
+ * Removes a context. We don't remove any QML until we receive signal from
+ * ofono that the context was removed, but we disconnect it if active.
+ *
+ * @param {String} path of context to be removed
+*/
+function removeContext (path) {
+    var ctx = getContextQML(path);
+
+    if (ctx && ctx.active) {
+        ctx.disconnect();
+    }
+
+    sim.connMan.removeContext(path);
+}
+
+/**
+ * Adds a context to the appropriate model. If the context to be added is found
+ * in another model, which will happen if the user changes type of the context,
+ * we remove it from the old model and add it to the new.
+ *
+ * @param {OfonoContextConnection} ctx to be added
+ * @param {String} [optional] type of context
+*/
+function addContextToModel (ctx, type) {
+    var data = {
+        path: ctx.contextPath,
+        qml: ctx
+    };
+    var model;
+    var oldModel;
+    var haveContext;
+
+    // We will move a model if it already exist.
+    [mmsContexts, internetContexts, iaContexts].forEach(function (m) {
+        var i;
+        for (i = 0; i < m.count && !haveContext; i++) {
+            if (ctx.contextPath == m.get(i).path) {
+                haveContext = m.get(i);
+                oldModel = m;
+                break;
+            }
+        }
+    });
+
+    if (typeof type === 'undefined') {
+        type = ctx.type;
+    }
+
+    if (haveContext && oldModel) {
+        oldModel.remove(haveContext);
+    }
+
+    model = getModelFromType(type);
+    model.append(data);
+}
+
+/**
+ * Removes a context from the appropriate model.
+ *
+ * @param {OfonoContextConnection} ctx to be removed
+ * @param {String} [optional] type of context
+*/
+function removeContextFromModel (ctx, type) {
+    var model = getModelFromType(type);
+    var i;
+
+    if (typeof type === 'undefined') {
+        type = ctx.type;
+    }
+
+    for (i = 0; i < model.count; i++) {
+        if (model.get(i).path === ctx.contextPath) {
+            model.remove(i);
+            return;
+        }
+    }
+}
+
+/**
+ * Handler for removed contexts.
+ *
+ * @param {String} path that was removed
+*/
+function contextRemoved (path) {
+    var paths = sim.connMan.contexts.slice(0);
+    var updatedPaths = paths.filter(function (val) {
+        return val !== path;
+    });
+    _garbageCollect(paths);
+}
+
+/**
+ * Handler for when a type has been determined. If a contex changes type,
+ * we need to move it to the correct model.
+ * Note that “this' refers to the context on which type changed.
+ *
+ * @param {String} type
+ */
+function contextTypeChanged (type) {
+    addContextToModel(this, type);
+}
+
+/**
+ * Handler for when validity of context changes.
+ * Note that “this' refers to the context on which valid changed.
+ *
+ * @param {Boolean} valid
+ */
+function contextValidChanged (valid) {
+    if (valid) {
+        _validContexts++;
+    } else {
+        _validContexts--;
+    }
+
+    if (_validContexts === _totalContext) {
+        root.ready();
+    }
+}
+
+/**
+ * Handler for when active changes.
+ * Note that “this' refers to the context on which active changed.
+ *
+ * @param {Boolean} active
+ */
+function contextActiveChanged (active) {
+    if (active) {
+        checkPreferred();
+    }
+}
+
+/**
+ * This is code that is supposed to identify new contexts that user creates.
+ * If we think the context is new, and the editor page is open, we notify it.
+ *
+ * Note that “this' refers to the context on which name changed.
+ *
+ * @param {String} name's new value
+*/
+function contextNameChanged (name) {
+    switch (name) {
+        case 'Internet':
+        case 'IA':
+        case 'MMS':
+            if (editor) {
+                editor.newContext(this);
+            }
+            break;
+    }
+    this.nameChanged.disconnect(contextNameChanged);
+}
+
+/**
+ * Handler for added contexts.
+ *
+ * @param {String} path which was added
+ */
+function contextAdded (path) {
+    _createQml([path]);
+}
+
+/**
+ * Handler for when contexts change.
+ *
+ * @param {Array:String} paths after change
+ */
+function contextsChanged (paths) {
+    updateQML(paths);
+    checkPreferred();
+}
+
+/**
+ * Handler for when errors are reported from ofono.
+ *
+ * @param {String} message from libqofono
+ */
+function reportError (message) {
+    console.error(message);
+}
+
+/**
+ * Set Preferred on a context. A side effect of this, if value is true, is
+ * that all other contexts of the same type will get de-preferred. If an
+ * MMS context is preferred, all other MMS contexts are de-preferred.
+ *
+ * There is also a case where if you prefer an MMS context when there already
+ * is a preferred Internet+MMS (combined) context. In this case we prompt the
+ * user what to do.
+ *
+ * Note: If triggered by a CheckBox, the “this” argument will be the CheckBox.
+ *
+ * @param {OfonoContextConnection} context to prefer
+ * @param {Boolean} new preferred value
+ * @param {Boolean} whether or not to force this action, even though it may
+ *                  decrease the level of connectivity of the user.
+*/
+function setPreferred (context, value, force) {
+    var conflictingContexts = getConflictingContexts(context);
+    var mmsPreferralCausesCombinedDePreferral;
+    var internetPreferralCausesCombinedDePreferral;
+
+    // The context is about to be de-preferred.
+    if (!value) {
+        if (force) {
+            context.preferred = false;
+        } else {
+            PopupUtils.open(disableContextWarning, root, {
+                context: context
+            });
+            this.checked = true;
+        }
+        return;
+    }
+
+    // If user is preferring standalone Internet or standalone MMS context,
+    // over a combined context, we will give a warning, if not forced.
+    conflictingContexts.forEach(function (ctxC) {
+        if (ctxC.isCombined) {
+            if (context.type === 'mms') {
+                mmsPreferralCausesCombinedDePreferral = ctxC;
+            }
+
+            if (context.type === 'internet') {
+                internetPreferralCausesCombinedDePreferral = ctxC;
+            }
+        }
+    });
+
+    if (mmsPreferralCausesCombinedDePreferral && !force) {
+        PopupUtils.open(disablesInternetWarning, root, {
+            combined: mmsPreferralCausesCombinedDePreferral,
+            mms: context
+        });
+        this.checked = false;
+        return;
+    } else if (internetPreferralCausesCombinedDePreferral && !force) {
+        PopupUtils.open(disablesMMSWarning, root, {
+            combined: internetPreferralCausesCombinedDePreferral,
+            internet: context
+        });
+        this.checked = false;
+        return;
+    }
+
+    conflictingContexts.forEach(function (ctx) {
+        ctx.preferred = false;
+    });
+
+    context.preferred = true;
+}
+
+/**
+ * Reset apn configuration.
+ */
+function reset () {
+    // If cellular data is on, we need to turn it off. The reset itself,
+    // as well as turning cellular data back on, is done by the use of a
+    // Connection component and connManPoweredChanged.
+    if (sim.connMan.powered) {
+        restorePowered.target = sim.connMan;
+        sim.connMan.powered = false;
+    } else {
+        connManPoweredChanged(sim.connMan.powered);
+    }
+}
+
+
+/**
+ * Handler for when powered changed. This handler is attached to a signal by
+ * a Connections component in PageChooseApn.qml.
+ */
+function connManPoweredChanged (powered) {
+    if (!powered) {
+
+        // We want to fire the ready signal again, once we've reset, but
+        // the reset contexts won't necessarily fire 'validChanged' signals,
+        // so we manually set valid contexts to 0.
+        _validContexts = 0;
+        root.ready.connect(ready);
+
+        sim.connMan.resetContexts();
+
+        // If restorePowered had a target, we know to turn cellular
+        // data back on.
+        if (restorePowered.target) {
+            sim.connMan.powered = true;
+        }
+    }
+    restorePowered.target = null;
+}
+
+/**
+ * Checks if there are preferred contexts. If there are none,
+ * we prefer the active one.
+ */
+function checkPreferred () {
+    var models = [internetContexts, iaContexts, mmsContexts];
+
+    models.forEach(function (model) {
+        var i;
+        var ctx;
+        var activeCtx;
+
+        // Find active contexts in model.
+        for (i = 0; i < model.count; i++) {
+            ctx = model.get(i).qml;
+
+            if (ctx.active) {
+                activeCtx = ctx;
+            }
+        }
+
+        if (activeCtx && getConflictingContexts(activeCtx).length === 0) {
+            activeCtx.preferred = true;
+        }
+    });
+}
+
+/**
+ * Gives a list of conflicting contexts, i.e. contexts that are preferred
+ * and will create problems† if preferred at the same time as the given
+ * context.
+ *
+ * † Multiple preferred contexts of the same type will cause undefined
+ * Nuntium and NetworkManager behaviour.
+ *
+ * @param {OfonoContextConnection|String} context to be preferred and to check
+                                          conflicts against, or type as string
+ * @return {Array:OfonoContextConnection} list of OfonoContextConnection that
+ *                                        are in conflict, excluding itself
+ *
+ */
+function getConflictingContexts (context) {
+    var type;
+    var conflicts = [];
+    var i;
+    var ctxI;
+    var typeModel;
+
+    if (typeof context === 'string') {
+        type = context;
+    } else {
+        type = context.isCombined ? 'internet+mms' : context.type;
+    }
+
+    switch (type) {
+        // A combined context will conflict with internet contexts and MMS
+        // contexts.
+        case 'internet+mms':
+            [internetContexts, mmsContexts].forEach(function (model) {
+                var i;
+                for (i = 0; i < model.count; i++) {
+                    ctxI = model.get(i).qml;
+                    if (ctxI.preferred) {
+                        conflicts.push(ctxI);
+                    }
+                }
+            });
+            break;
+        // An MMS context will conflict with other MMS contexts, as well as
+        // combined contexts.
+        case 'mms':
+            for (i = 0; i < mmsContexts.count; i++) {
+                ctxI = mmsContexts.get(i).qml;
+                if (ctxI.preferred) {
+                    conflicts.push(ctxI);
+                }
+            }
+            for (i = 0; i < internetContexts.count; i++) {
+                ctxI = internetContexts.get(i).qml;
+                if (ctxI.isCombined && ctxI.preferred) {
+                    conflicts.push(ctxI);
+                }
+            }
+            break;
+        case 'internet':
+        case 'ia':
+            typeModel = getModelFromType(type);
+            for (i = 0; i < typeModel.count; i++) {
+                ctxI = typeModel.get(i).qml;
+                if (ctxI.preferred) {
+                    conflicts.push(ctxI);
+                }
+            }
+            break;
+        default:
+            throw new Error('Can\'t resolve conflicts for type' + type);
+    }
+
+    return conflicts;
+}
+
+function ready () {
+    checkPreferred();
+    root.ready.disconnect(ready);
 }
 
=== removed file 'plugins/cellular/ofonoactivator.cpp'
--- plugins/cellular/ofonoactivator.cpp	2014-10-09 10:50:50 +0000
+++ plugins/cellular/ofonoactivator.cpp	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * Authors:
- *    Jussi Pakkanen <[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 library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser 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/>.
- */
-
-#include "ofonoactivator.h"
-
-#include"nm_manager_proxy.h"
-#include"nm_settings_proxy.h"
-#include"nm_settings_connection_proxy.h"
-#include<QCoreApplication>
-
-typedef QMap<QString,QVariantMap> Vardict;
-Q_DECLARE_METATYPE(Vardict)
-
-namespace {
-
-QString nmService("org.freedesktop.NetworkManager");
-QString nmSettingsPath("/org/freedesktop/NetworkManager/Settings");
-QString nmPath("/org/freedesktop/NetworkManager");
-
-QDBusObjectPath detectConnection(const QString &ofonoContext, const QString imsi) {
-    auto ofonoContextBase = ofonoContext.split('/').back();
-    auto target = "/" + imsi + "/" + ofonoContextBase;
-
-    OrgFreedesktopNetworkManagerSettingsInterface settings(nmService, nmSettingsPath,
-            QDBusConnection::systemBus());
-    auto reply = settings.ListConnections();
-    reply.waitForFinished();
-    if(!reply.isValid()) {
-        qWarning() << "Error getting connection list: " << reply.error().message() << "\n";
-    }
-    auto connections = reply.value(); // Empty list if failed.
-
-    for(const auto &c : connections) {
-        OrgFreedesktopNetworkManagerSettingsConnectionInterface connProxy(nmService,
-                c.path(), QDBusConnection::systemBus());
-        auto reply2 = connProxy.GetSettings();
-        reply2.waitForFinished();
-        if(!reply2.isValid()) {
-            qWarning() << "Error getting property: " << reply2.error().message() << "\n";
-            continue;
-        }
-        auto settings = reply2.value();
-        auto id = settings["connection"]["id"].toString();
-        if(id == target) {
-            return c;
-        }
-    }
-    return QDBusObjectPath("");
-}
-
-QDBusObjectPath detectDevice(const QString &modemPath) {
-    OrgFreedesktopNetworkManagerInterface nm(nmService, nmPath, QDBusConnection::systemBus());
-    auto reply = nm.GetDevices();
-    reply.waitForFinished();
-    auto devices = reply.value();
-
-    for(const auto &device : devices) {
-        QDBusInterface iface(nmService, device.path(), "org.freedesktop.DBus.Properties",
-                QDBusConnection::systemBus());
-        QDBusReply<QDBusVariant> ifaceReply = iface.call("Get",
-                "org.freedesktop.NetworkManager.Device", "Interface");
-        if(!ifaceReply.isValid()) {
-            qWarning() << "Error getting property: " << ifaceReply.error().message() << "\n";
-            continue;
-        }
-        auto devIface = ifaceReply.value().variant().toString();
-        if(devIface == modemPath) {
-            return device;
-        }
-    }
-    return QDBusObjectPath("");
-}
-}
-
-void activateOfono(QDBusObjectPath connection, QDBusObjectPath device)
-{
-    OrgFreedesktopNetworkManagerInterface nm(nmService, nmPath, QDBusConnection::systemBus());
-
-
-    /// @bug https://bugs.launchpad.net/ubuntu/+source/network-manager/+bug/1378102
-    /// This is a big and fat workaround for the above bug
-    // this is probably racy as well as we are not tracking the ActiveConnection to know
-    // when the Device has actually disconnected.
-    QDBusInterface dev_iface("org.freedesktop.NetworkManager",
-                             device.path(),
-                             "org.freedesktop.NetworkManager.Device",
-                             nm.connection());
-    dev_iface.call("Disconnect");
-
-
-    nm.ActivateConnection(connection, device, QDBusObjectPath("/"));
-}
-
-OfonoActivator::OfonoActivator(QObject *parent) : QObject(parent) {
-    static bool isRegistered = false;
-    if(!isRegistered) {
-        qDBusRegisterMetaType<Vardict>();
-        isRegistered = true;
-    }
-}
-
-Q_INVOKABLE bool OfonoActivator::activate(const QString ofonoContext, const QString imsi, const QString modemPath)
-{
-    auto dev = detectDevice(modemPath);
-    if(dev.path() == "") {
-        qWarning() << "Could not detect device object to use for Ofono activation.\n";
-        return false;
-    }
-    auto conn = detectConnection(ofonoContext, imsi);
-    if(conn.path() == "") {
-        qWarning() << "Could not detect connection object to use for Ofono activation.\n";
-        return false;
-    }
-    activateOfono(conn, dev);
-    return true;
-}
 
=== removed file 'plugins/cellular/ofonoactivator.h'
--- plugins/cellular/ofonoactivator.h	2014-08-27 09:11:52 +0000
+++ plugins/cellular/ofonoactivator.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * Authors:
- *    Jussi Pakkanen <[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 library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser 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/>.
- */
-
-#ifndef OFONO_ACTIVATOR
-#define OFONO_ACTIVATOR
-
-#include <QObject>
-
-/**
- * For exposing ofono controls to qml.
- */
-
-class OfonoActivator : public QObject {
-    Q_OBJECT
-
-public:
-    OfonoActivator(QObject *parent = nullptr);
-    ~OfonoActivator() {};
-
-    Q_INVOKABLE bool activate(const QString ofonoContext,  const QString imsi, const QString modemPath);
-
-private:
-};
-
-
-#endif
 
=== modified file 'plugins/cellular/plugin.cpp'
--- plugins/cellular/plugin.cpp	2015-01-21 20:44:20 +0000
+++ plugins/cellular/plugin.cpp	2015-07-27 14:21:15 +0000
@@ -21,7 +21,6 @@
 #include <QtQml/QQmlContext>
 #include "connectivity.h"
 #include "hotspotmanager.h"
-#include "ofonoactivator.h"
 
 static QObject *connectivitySingeltonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
@@ -37,7 +36,6 @@
     Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
     qmlRegisterSingletonType<Connectivity>(uri, 1, 0, "Connectivity", connectivitySingeltonProvider);
     qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
-    qmlRegisterType<OfonoActivator>(uri, 1, 0, "OfonoActivator");
 }
 
 void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-07-22 12:54:52 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-07-27 14:21:15 +0000
@@ -187,6 +187,12 @@
         return False
 
 
+class LabelTextField(ubuntuuitoolkit.TextField):
+    """LabelTextField is a component local to the APN Editor in the cellular
+    plugin."""
+    pass
+
+
 class CellularPage(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
     """Autopilot helper for the Cellular page."""
@@ -262,6 +268,24 @@
         chooseCarrierPage.set_carrier(carrier)
 
     @autopilot.logging.log_action(logger.debug)
+    def open_apn_editor(self, name, sim=None):
+        carrierApnPage = self._click_carrier_apn()
+        chooseApnPage = carrierApnPage.open_apn(sim)
+        return chooseApnPage.open(name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def delete_apn(self, name, sim=None):
+        carrierApnPage = self._click_carrier_apn()
+        chooseApnPage = carrierApnPage.open_apn(sim)
+        return chooseApnPage.delete(name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def prefer_apn(self, name, sim=None):
+        carrierApnPage = self._click_carrier_apn()
+        chooseApnPage = carrierApnPage.open_apn(sim)
+        return chooseApnPage.check(name)
+
+    @autopilot.logging.log_action(logger.debug)
     def _click_carrier_apn(self):
         item = self.select_single(objectName='carrierApnEntry')
         self.pointing_device.click_object(item)
@@ -351,11 +375,22 @@
         return self.get_root_instance().wait_select_single(
             objectName='chooseCarrierPage')
 
+    @autopilot.logging.log_action(logger.debug)
+    def open_apn(self, sim):
+        return self._click_apn(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_apn(self, sim):
+        obj = self.select_single(
+            objectName='apn')
+        self.pointing_device.click_object(obj)
+        return self.get_root_instance().wait_select_single(
+            objectName='apnPage')
+
 
 class PageCarriersAndApns(
         ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
     """Autopilot helper for carrier/apn entry page (multisim)."""
-    """Autopilot helper for carrier/apn entry page (singlesim)."""
     @autopilot.logging.log_action(logger.debug)
     def open_carrier(self, sim):
         return self._click_carrier(sim)
@@ -378,6 +413,7 @@
         item = self.select_single(text='Automatically')
         self.pointing_device.click_object(item)
 
+    @autopilot.logging.log_action(logger.debug)
     def set_carrier(self, carrier):
         # wait for animation, since page.animationRunning.wait_for(False)
         # does not work?
@@ -396,6 +432,116 @@
         self.pointing_device.click_object(item)
 
 
+class PageChooseApn(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for apn editor page"""
+
+    @autopilot.logging.log_action(logger.debug)
+    def open(self, name):
+        return self._open_editor(name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def delete(self, name):
+        self._delete(name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _delete(self, name):
+        item = self.wait_select_single('Standard', objectName='edit_%s' % name)
+        item.swipe_to_delete()
+        item.confirm_removal()
+
+    @autopilot.logging.log_action(logger.debug)
+    def check(self, name):
+        self._check(name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _check(self, name):
+        item = self.wait_select_single(
+            'CheckBox', objectName='%s_preferred' % name
+        )
+        item.check()
+
+    @autopilot.logging.log_action(logger.debug)
+    def _open_editor(self, name):
+        if name:
+            item = self.select_single(objectName='edit_%s' % name)
+            self.pointing_device.click_object(item)
+        else:
+            main_view = self.get_root_instance().select_single(
+                objectName='systemSettingsMainView')
+            header = main_view.select_single('AppHeader')
+            header.click_action_button('newApn')
+        return self.get_root_instance().wait_select_single(
+            objectName='apnEditor')
+
+
+class PageApnEditor(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for apn editor page"""
+
+    flickable = None
+
+    def __init__(self, *args):
+        super().__init__(*args)
+        self.flickable = self.select_single(objectName='scrollArea')
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_type(self, t):
+        selector = self.select_single(
+            'ItemSelector', objectName='typeSelector')
+        self.pointing_device.click_object(selector)
+        selector.currentlyExpanded.wait_for(True)
+        item = self.select_single(objectName='type_%s' % t)
+
+        # A bit dirty
+        while selector.currentlyExpanded:
+            self.pointing_device.click_object(item)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_name(self, new_name):
+        self._populate_field('name', new_name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_access_point_name(self, new_name):
+        self._populate_field('accessPointName', new_name)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_message_center(self, new_message_center):
+        self._populate_field('messageCenter', new_message_center)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_message_proxy(self, new_message_proxy):
+        self._populate_field('messageProxy', new_message_proxy)
+
+        # Sleep for the duration of the timer that will copy any
+        # port into the port field
+        sleep(1.5)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_port(self, new_port):
+        self._populate_field('port', new_port)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_username(self, new_username):
+        self._populate_field('username', new_username)
+
+    @autopilot.logging.log_action(logger.debug)
+    def set_password(self, new_password):
+        self._populate_field('password', new_password)
+
+    def _populate_field(self, field, text):
+        f = self.select_single(LabelTextField, objectName=field)
+        self.flickable.swipe_child_into_view(f)
+        f.write(text)
+
+    @autopilot.logging.log_action(logger.debug)
+    def save(self):
+        main_view = self.get_root_instance().select_single(
+            objectName='systemSettingsMainView')
+        header = main_view.select_single('AppHeader')
+        header.click_action_button('saveApn')
+
+
 class SecurityPage(ubuntuuitoolkit.QQuickFlickable):
 
     """Autopilot helper for the Security page."""
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-17 15:06:35 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-07-27 14:21:15 +0000
@@ -180,22 +180,6 @@
         return 'ret = [(m, objects[m].GetAll("org.ofono.NetworkOperator")) ' \
                'for m in objects if "%s/operator/" in m]' % name
 
-    def mock_connection_manager(self, modem):
-        modem.AddProperty(CONNMAN_IFACE, 'Powered', dbus.Boolean(1))
-        modem.AddProperty(CONNMAN_IFACE, 'RoamingAllowed', dbus.Boolean(0))
-        modem.AddMethods(
-            CONNMAN_IFACE,
-            [
-                (
-                    'GetProperties', '', 'a{sv}',
-                    'ret = self.GetAll("%s")' % CONNMAN_IFACE),
-                (
-                    'SetProperty', 'sv', '',
-                    'self.Set("IFACE", args[0], args[1]); '
-                    'self.EmitSignal("IFACE", "PropertyChanged", "sv",\
-                        [args[0], args[1]])'.replace("IFACE", CONNMAN_IFACE)),
-            ])
-
     def mock_carriers(self, name):
         self.dbusmock.AddObject(
             '/%s/operator/op2' % name,
@@ -284,7 +268,6 @@
 
         self.mock_carriers('ril_0')
         self.mock_radio_settings(self.modem_0)
-        self.mock_connection_manager(self.modem_0)
         self.mock_call_forwarding(self.modem_0)
         self.mock_call_settings(self.modem_0)
 
@@ -295,6 +278,9 @@
             ('GetOperators', '', 'a(oa{sv})', self.get_all_operators('ril_0')),
             ('Scan', '', 'a(oa{sv})', self.get_all_operators('ril_0')),
         ])
+        self.modem_0.connMan = dbus.Interface(self.dbus_con.get_object(
+                                              'org.ofono', '/ril_0'),
+                                              'org.ofono.ConnectionManager')
 
     def add_sim2(self):
         '''Mock two modems/sims for the dual sim story'''
@@ -315,7 +301,6 @@
         ])
         self.mock_carriers(second_modem)
         self.mock_radio_settings(self.modem_1, technologies=['gsm'])
-        self.mock_connection_manager(self.modem_1)
         self.mock_call_forwarding(self.modem_1)
         self.mock_call_settings(self.modem_1)
 
@@ -324,6 +309,10 @@
             'SubscriberNumbers', ['08123', '938762783']
         )
 
+        self.modem_1.connMan = dbus.Interface(self.dbus_con.get_object(
+                                              'org.ofono', '/' + second_modem),
+                                              'org.ofono.ConnectionManager')
+
     @classmethod
     def setUpClass(cls):
         cls.start_system_bus()
@@ -378,6 +367,16 @@
         super(CellularBaseTestCase, self).setUp()
         self.cellular_page = self.main_view.go_to_cellular_page()
 
+    def add_connection_context(self, modem, **kwargs):
+        iface = 'org.ofono.ConnectionContext'
+        path = modem.connMan.AddContext(kwargs.get('Type', 'internet'))
+        context = dbus.Interface(self.dbus_con.get_object(
+                                 'org.ofono', path),
+                                 iface)
+
+        for key, value in kwargs.items():
+            context.SetProperty(key, value)
+
 
 class BluetoothBaseTestCase(UbuntuSystemSettingsTestCase):
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/ofono.py'
--- tests/autopilot/ubuntu_system_settings/tests/ofono.py	2015-07-22 12:54:57 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/ofono.py	2015-07-27 14:21:15 +0000
@@ -88,6 +88,7 @@
     obj.name = name
     obj.sim_pin = "2468"
     add_simmanager_api(obj)
+    add_connectionmanager_api(obj)
     add_voice_call_api(obj)
     add_netreg_api(obj)
     self.modems.append(path)
@@ -127,6 +128,104 @@
     ])
 
 
+def add_connectionmanager_api(mock):
+    '''Add org.ofono.ConnectionManager API to a mock'''
+
+    iface = 'org.ofono.ConnectionManager'
+    mock.contexts = []
+    mock.AddProperties(iface, {
+        'Attached': _parameters.get('Attached', True),
+        'Bearer': _parameters.get('Bearer', 'gprs'),
+        'RoamingAllowed': _parameters.get('RoamingAllowed', False),
+        'Powered': _parameters.get('ConnectionPowered', True),
+    })
+    mock.AddMethods(iface, [
+        ('GetProperties', '', 'a{sv}', 'ret = self.GetAll("%s")' % iface),
+        ('SetProperty', 'sv', '', 'self.Set("%(i)s", args[0], args[1]); '
+         'self.EmitSignal("%(i)s", "PropertyChanged", "sv", ['
+         'args[0], args[1]])' % {'i': iface}),
+        ('AddContext', 's', 'o', 'ret = self.AddConnectionContext(args[0])'),
+        ('RemoveContext', 'o', '', 'self.RemoveConnectionContext(args[0])'),
+        ('DeactivateAll', '', '', ''),
+        ('GetContexts', '', 'a(oa{sv})', 'ret = self.GetConnectionContexts()'),
+    ])
+
+    interfaces = mock.GetProperties()['Interfaces']
+    interfaces.append(iface)
+    mock.SetProperty('Interfaces', interfaces)
+
+
[e-mail]('org.ofono.ConnectionManager',
+                     in_signature='', out_signature='a(oa{sv})')
+def GetConnectionContexts(self):
+    contexts = dbus.Array([], signature='a(oa{sv})')
+    for ctx in self.contexts:
+        contexts.append(dbus.Struct(
+            (ctx.__dbus_object_path__, ctx.GetProperties())))
+    return contexts
+
+
[e-mail]('org.ofono.ConnectionManager',
+                     in_signature='s', out_signature='o')
+def AddConnectionContext(self, type):
+    name = 'context%s' % str(len(self.contexts))
+    path = '%s/%s' % (self.__dbus_object_path__, name)
+    iface = 'org.ofono.ConnectionContext'
+
+    # We give the context a name, just like ofono does.
+    # See https://github.com/rilmodem/ofono/blob/master/src/gprs.c#L148
+    ofono_default_accesspointname = {
+        'internet': 'Internet',
+        'mms': 'MMS',
+        'ai': 'AI',
+        'ims': 'IMS',
+        'wap': 'WAP'
+    }
+
+    self.AddObject(
+        path,
+        iface,
+        {
+            'Active': False,
+            'AccessPointName': '',
+            'Type': type,
+            'Username': '',
+            'Password': '',
+            'Protocol': 'ip',
+            'Name': ofono_default_accesspointname[type],
+            'Preferred': False,
+            'Settings': dbus.Dictionary({}, signature='sv'),
+            'IPv6.Settings': dbus.Dictionary({}, signature='sv'),
+            'MessageProxy': '',
+            'MessageCenter': '',
+        },
+        [
+            ('GetProperties', '', 'a{sv}',
+                'ret = self.GetAll("org.ofono.ConnectionContext")'),
+            (
+                'SetProperty', 'sv', '',
+                'self.Set("%s", args[0], args[1]); '
+                'self.EmitSignal("%s", "PropertyChanged",'
+                '"sv", [args[0], args[1]])' % (iface, iface)),
+        ])
+    ctx_obj = dbusmock.get_object(path)
+    self.contexts.append(ctx_obj)
+    self.EmitSignal('org.ofono.ConnectionManager',
+                    'ContextAdded', 'oa{sv}', [path, ctx_obj.GetProperties()])
+
+    return path
+
+
[e-mail]('org.ofono.ConnectionManager',
+                     in_signature='o', out_signature='')
+def RemoveConnectionContext(self, path):
+    ctx_obj = dbusmock.get_object(path)
+    self.contexts.remove(ctx_obj)
+    self.RemoveObject(path)
+    self.EmitSignal('org.ofono.ConnectionManager',
+                    'ContextRemoved', 'o', [path])
+
+
 @dbus.service.method('org.ofono.SimManager',
                      in_signature='ss', out_signature='')
 def LockPin(self, pin_type, pin):
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-10-29 15:51:17 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2015-07-27 14:21:15 +0000
@@ -288,3 +288,144 @@
             lambda:
                 gsettings.get_value('default-sim-for-messages').get_string(),
             Eventually(Equals('/ril_1')))
+
+
+class ApnTestCase(CellularBaseTestCase):
+
+    def test_remove_apn(self):
+        self.add_connection_context(self.modem_0, Type='mms', Name='Failed')
+        contexts = self.modem_0.connMan.GetContexts()
+
+        # Assert there's a Failed mms context
+        self.assertEqual(1, len(contexts))
+        self.assertEqual('/ril_0/context0', contexts[0][0])
+        self.assertEqual('Failed', contexts[0][1]['Name'])
+
+        # We delete the failed context
+        self.cellular_page.delete_apn('Failed')
+
+    def test_create_internet_apn(self):
+        editor = self.cellular_page.open_apn_editor(None)
+        editor.set_type('internet')
+        editor.set_name('Ubuntu')
+        editor.set_access_point_name('ubuntu.ap')
+        editor.set_username('user')
+        editor.set_password('pass')
+        editor.save()
+
+        # Wait for our new context to appear.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][0],
+            Eventually(Equals('/ril_0/context0'))
+        )
+        # Wait for our context to be renamed from the default ofono name.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][1]['Name'],
+            Eventually(Equals('Ubuntu'))
+        )
+        contexts = self.modem_0.connMan.GetContexts()
+        new_ctx = contexts[0][1]
+        self.assertEqual(1, len(contexts))
+        self.assertEqual('internet', new_ctx['Type'])
+        self.assertEqual('user', new_ctx['Username'])
+        self.assertEqual('pass', new_ctx['Password'])
+
+    def test_create_mms_apn(self):
+        editor = self.cellular_page.open_apn_editor(None)
+        editor.set_type('mms')
+        editor.set_name('Ubuntu')
+        editor.set_access_point_name('ubuntu.ap')
+        editor.set_message_center('ubuntu.com')
+        editor.set_message_proxy('ubuntu:8080')
+        editor.set_username('user')
+        editor.set_password('pass')
+        editor.save()
+
+        # Wait for our new context to appear.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][0],
+            Eventually(Equals('/ril_0/context0'))
+        )
+        # Wait for our context to be renamed from the default ofono name.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][1]['Name'],
+            Eventually(Equals('Ubuntu'))
+        )
+        contexts = self.modem_0.connMan.GetContexts()
+        new_ctx = contexts[0][1]
+        self.assertEqual(1, len(contexts))
+        self.assertEqual('mms', new_ctx['Type'])
+        self.assertEqual('ubuntu.ap', new_ctx['AccessPointName'])
+        self.assertEqual('http://ubuntu.com', new_ctx['MessageCenter'])
+        self.assertEqual('ubuntu:8080', new_ctx['MessageProxy'])
+        self.assertEqual('user', new_ctx['Username'])
+        self.assertEqual('pass', new_ctx['Password'])
+
+    def test_create_mms_and_internet_apn(self):
+        editor = self.cellular_page.open_apn_editor(None)
+        editor.set_type('internet+mms')
+        editor.set_name('Ubuntu')
+        editor.set_access_point_name('ubuntu.ap')
+        editor.set_message_center('ubuntu.com')
+        editor.set_message_proxy('ubuntu:8080')
+        editor.set_username('user')
+        editor.set_password('pass')
+        editor.save()
+
+        # Wait for our new context to appear.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][0],
+            Eventually(Equals('/ril_0/context0'))
+        )
+        # Wait for our context to be renamed from the default ofono name.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][1]['Name'],
+            Eventually(Equals('Ubuntu'))
+        )
+        contexts = self.modem_0.connMan.GetContexts()
+        new_ctx = contexts[0][1]
+        self.assertEqual(1, len(contexts))
+        self.assertEqual('internet', new_ctx['Type'])
+        self.assertEqual('ubuntu.ap', new_ctx['AccessPointName'])
+        self.assertEqual('http://ubuntu.com', new_ctx['MessageCenter'])
+        self.assertEqual('ubuntu:8080', new_ctx['MessageProxy'])
+        self.assertEqual('user', new_ctx['Username'])
+        self.assertEqual('pass', new_ctx['Password'])
+
+    def create_lte_apn(self):
+        editor = self.cellular_page.open_apn_editor(None)
+        editor.set_type('ia')
+        editor.set_name('Ubuntu')
+        editor.set_access_point_name('ubuntu.ap')
+        editor.set_username('user')
+        editor.set_password('pass')
+        editor.save()
+
+        # Wait for our new context to appear.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][0],
+            Eventually(Equals('/ril_0/context0'))
+        )
+        # Wait for our context to be renamed from the default ofono name.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][1]['Name'],
+            Eventually(Equals('Ubuntu'))
+        )
+        contexts = self.modem_0.connMan.GetContexts()
+        new_ctx = contexts[0][1]
+        self.assertEqual(1, len(contexts))
+        self.assertEqual('ia', new_ctx['Type'])
+        self.assertEqual('user', new_ctx['Username'])
+        self.assertEqual('pass', new_ctx['Password'])
+
+    def select_apn(self):
+        self.add_connection_context(self.modem_0,
+                                    Type='internet', Name='Provisioned')
+
+        self.cellular_page.prefer_apn('Provisioned')
+
+        # Assert that Preferred becomes true.
+        self.assertThat(
+            lambda: self.modem_0.connMan.GetContexts()[0][1]['Preferred'],
+            Eventually(Equals(True))
+        )