Merge lp:~jonas-drange/ubuntu-system-settings/rtm-apneditor-libqofono-compat into lp:ubuntu-system-settings/rtm-14.09

[Jonas G. Drange]

[cellular] makes the apn editor compatible to libqofono 0.7

[cellular] makes the apn editor compatible to libqofono 0.7

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:989
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/61/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-14.09-touch/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/62/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-14.09-mako/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/40
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-14.09-armhf/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18089

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

I've verified it isn't creating the duplicate contexts with libqofono 0.70, so great! I can't create a working context with my SIM, which isn't new. The code looks fine, thanks!

review: Approve

=== modified file 'plugins/cellular/CustomApnEditor.qml'
--- plugins/cellular/CustomApnEditor.qml	2014-10-06 14:28:46 +0000
+++ plugins/cellular/CustomApnEditor.qml	2015-02-16 14:04:43 +0000
@@ -139,7 +139,7 @@
                 }
                 /// @todo disable for now
                 //visible: d.isMms
-                visible: false                
+                visible: false
                 text: i18n.tr("Same APN as for Internet")
                 control: Switch {
                     id: doBoth
@@ -300,7 +300,6 @@
                             pageStack.pop();
                             return;
                         }
-
                         ctx.accessPointName = apnName.text;
                         ctx.username = userName.text;
                         ctx.password = pword.text;

=== modified file 'plugins/cellular/PageChooseApn.qml'
--- plugins/cellular/PageChooseApn.qml	2014-10-06 19:36:13 +0000
+++ plugins/cellular/PageChooseApn.qml	2015-02-16 14:04:43 +0000
@@ -50,6 +50,7 @@
         // suppress any actions that we don't want to take
         // when updating selectedIndexes, etc
         property bool __suppressActivation : true;
+        property bool __haveCustomContexts : false;
 
         function isEmptyCustom (type, ctx)
         {
@@ -76,9 +77,9 @@
             return false;
         }
 
-        function updateContexts()
+        function updateContexts(contexts)
         {
-            var tmp = sim.connMan.contexts.slice(0);
+            var tmp = contexts || sim.connMan.contexts.slice(0);
             var added = tmp.filter(function(i) {
                 return mContexts[i] === undefined;
             });
@@ -118,26 +119,6 @@
                                                    "contextPath": currentValue
                                                });
                 mContexts[currentValue] = ctx;
-
-                if (isEmptyCustom("internet", ctx))
-                {
-                    ctx.name = mCustomContextNameInternet;
-                    // name updates async, so return here and
-                    // have the buildLists() called from Context::onNameChanged
-                    return;
-                } else if (isEmptyCustom("mms", ctx))
-                {
-                    ctx.name = mCustomContextNameMms;
-                    ctx.accessPointName = pendingCustomMmsData["accessPointName"];
-                    ctx.username = pendingCustomMmsData["username"];
-                    ctx.password = pendingCustomMmsData["password"];
-                    ctx.messageCenter = pendingCustomMmsData["messageCenter"];
-                    ctx.messageProxy = pendingCustomMmsData["messageProxy"];
-                    pendingCustomMmsData = ({});
-                    // values update async, so return here and
-                    // have the buildLists() called from Context::onNameChanged
-                    return;
-                }
             });
 
             // just asserting to verify the logic
@@ -156,8 +137,7 @@
         }
 
         // expects updateContexts() to have ran before executing.
-        function checkAndCreateCustomContexts()
-        {
+        function checkAndCreateCustomContexts() {
             var customInternet = Object.keys(mContexts).filter(function (i) {
                 var ctx = mContexts[i];
                 return ctx.name === mCustomContextNameInternet ||
@@ -250,6 +230,8 @@
             mInternetApns = internet;
             mMmsApns = mms;
 
+            internetApnSelector.updateSelectedIndex();
+
             d.__suppressActivation = false;
         }
 
@@ -312,14 +294,29 @@
 
             // add helper property to detect dual internet/MMS contexts
             property bool dual : false
-            Component.onCompleted:{
+            onTypeChanged:{
                 if (type == "internet")
                     if (messageCenter !== "")
                         dual = true
+
+                d.buildLists();
             }
 
             onActiveChanged: if (type === "internet") internetApnSelector.updateSelectedIndex()
-            onNameChanged: d.buildLists()
+            onNameChanged: {
+                if (name === "Internet") {
+                    this.name = d.mCustomContextNameInternet;
+                } else 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)
         }
@@ -327,12 +324,8 @@
 
     Connections {
         target: sim.connMan
-        onContextsChanged: d.updateContexts()
-
+        onContextsChanged: d.updateContexts(contexts)
         Component.onCompleted: {
-            d.updateContexts();
-
-
             /// @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
@@ -347,9 +340,7 @@
                 sim.connMan.removeContext(currentValue);
             });
 
-
-            // do this once.
-            d.checkAndCreateCustomContexts();
+            d.updateContexts();
         }
     }
 
@@ -360,211 +351,207 @@
         boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
         flickableDirection: Flickable.VerticalFlick
 
+
         Column {
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-
-            ListItem.Standard {
-                id: heading1
-                objectName: "internetapn"
+            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:")
-                progression: false
-            }
-            ListItem.ThinDivider {}
-            ListItem.SingleControl {
-                control: ListItem.ItemSelector {
-                    id: internetApnSelector
-                    width: parent.width - units.gu(4)
-                    model: d.mInternetApns
-                    expanded: true
-                    selectedIndex: -1
-                    onModelChanged: updateSelectedIndex()
+                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;
+                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");
-                                }
+                delegate: OptionSelectorDelegate {
+                    showDivider: false
+                    text: {
+                        var ctx = d.mContexts[modelData];
+                        if (ctx.name !== "") {
+                            if (ctx.name !== d.mCustomContextNameInternet) {
+                                return ctx.name
                             } else {
-                                return ctx.accessPointName
+                                //: 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")
+                }
+                onSelectedIndexChanged: {
+                    if (selectedIndex === -1) {
+                        if (mmsApnSelector && mmsApnSelector.model[mmsApnSelector.selectedIndex] === "/same/as/internet")
                             mmsApnSelector.selectedIndex = -1;
-
-                        if (d.__suppressActivation)
+                        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;
-
-                        if (d.mCustomContextInternet && model[selectedIndex] === d.mCustomContextInternet.contextPath) {
-                            if (d.mCustomContextInternet.accessPointName === "") {
-                                d.openApnEditor("internet");
-                                updateSelectedIndex();
-                                return;
-                            }
                         }
-
-                        d.activateHelper("internet", ctx.contextPath);
-                    }
-                }
-            }
-            ListItem.SingleControl {
-                control: Button {
-                    objectName: "customApnEdit"
-                    text: i18n.tr("Custom Internet APN…")
-                    width: parent.width - units.gu(4)
-                    onClicked: d.openApnEditor("internet")
-                }
-            }
-
-            ListItem.Divider {}
-
-            ListItem.Standard {
-                id: heading2
-                objectName: "mmsapn"
+                    }
+
+                    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: {
+                    if (!d.__haveCustomContexts) {
+                        d.checkAndCreateCustomContexts();
+                        d.__haveCustomContexts = true;
+                    }
+
+                    d.openApnEditor("internet")
+                }
+            }
+
+            ListItem.ItemSelector {
+                id: mmsApnSelector
+                width: parent.width
+                model: d.mMmsApns
+                expanded: true
+                selectedIndex: -1
                 text: i18n.tr("MMS APN:")
-                progression: false
-            }
-            ListItem.ThinDivider {}
-            ListItem.SingleControl {
-                control: ListItem.ItemSelector {
-                    id: mmsApnSelector
-                    width: parent.width - units.gu(4)
-                    model: d.mMmsApns
-                    expanded: true
-                    selectedIndex: -1
-                    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") {
+                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");
                             }
-                            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 {
+                            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;
-                        }
-                        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
-                    }
+                    } 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
                 }
             }
-            ListItem.SingleControl {
-                control: Button {
-                    objectName: "customApnEdit"
-                    text: i18n.tr("Custom MMS APN…")
-                    width: parent.width - units.gu(4)
-                    onClicked: d.openApnEditor("mms")
+
+            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");
                 }
             }