Merge into trunk : apneditor : Code : ubuntu-system-settings

Reviewer	Review Type	Date Requested	Status
Ken VanDine			Approve on 2014-10-10
PS Jenkins bot	continuous-integration	2014-10-03	Needs Fixing on 2014-10-09
Iain Lane		2014-10-03	Pending
Jonas G. Drange		2014-10-03	Pending
Review via email: mp+237138@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-22: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-23: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Iain Lane (laney) wrote on 2014-07-23: Posted in a previous version of this proposal

#

Not reviewed, but please make sure to wrap all lines at 80 characters and fix the copyright years.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-23: Posted in a previous version of this proposal

#

We don't have an 80 character line limit any more. It's 132 now. See for example:

https://bazaar.launchpad.net/~unity-team/unity-api/trunk/view/head:/astyle-config

Revision history for this message

Iain Lane (laney) wrote on 2014-07-23: Posted in a previous version of this proposal

#

On Wed, Jul 23, 2014 at 02:08:11PM -0000, Jussi Pakkanen wrote:
> We don't have an 80 character line limit any more. It's 132 now. See for example:

Who decided this for ubuntu-system-settings.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

Sebastien Bacher (seb128) wrote on 2014-07-23: Posted in a previous version of this proposal

#

@Jussi, the document you pointed is not from the settings project, we use a 80 chars wrap count here

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-23: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Iain Lane (laney) wrote on 2014-07-23: Posted in a previous version of this proposal

#

On Wed, Jul 23, 2014 at 03:15:53PM -0000, Sebastien Bacher wrote:
> @Jussi, the document you pointed is not from the settings project, we use a 80 chars wrap count here

However we are discussing it - GNOME recommends between 80 and 120 & we
might align on this.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-23: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-24: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-25: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Iain Lane (laney) wrote on 2014-08-13: Posted in a previous version of this proposal

#

Please could you make sure the AP tests are passing. Also remove all stray warnings.

If this isn't ready - some comments suggest it isn't - set the branch to WIP please.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-08-14: Posted in a previous version of this proposal

#

See inline comments. There's some Loader magic going on. Happy to explain, but for now, remove the data preference code in PageComponent as well as the code that re-creates a lot of ofono objects.

review: Needs Fixing

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-08-14: Posted in a previous version of this proposal

#

Fixed one, need some help with the other. Thanks.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-27: Posted in a previous version of this proposal

#

There are a number of asserts in the code with comments that they should be removed, like:
// just asserting to verify the logic
// remove once proven functional

Those should probably removed.

There are a number of places with commented out code (like properties), other than the TODOs and place holders for future work. Please remove them if they aren't needed.

review: Needs Fixing

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-08-27: Posted in a previous version of this proposal

#

Download full text (3.9 KiB)

I see the following output using those debs

2014-08-27 16:23:38,267 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseCarrier.qml:67:17: Unable to assign [undefined] to QObject*
2014-08-27 16:23:38,308 - WARNING - QOfonoNetworkOperator::registerOperator() failed: QDBusError("org.ofono.Error.AccessDenied", "Operation not permitted")
2014-08-27 16:23:38,308 - WARNING - registerComplete failed with error: org.ofono.Error.AccessDenied Operation not permitted Falling back to default
2014-08-27 16:24:12,488 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:268:5: QML Connections: Cannot assign to non-existent propert
y "onContextsChanged"
2014-08-27 16:24:12,493 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:55: TypeError: Cannot read property 'contexts' of undefined
2014-08-27 16:24:12,494 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:269:17: Unable to assign [undefined] to QObject*
pa

and this is syslog:

Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: Modem found: '/ril_0'
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: killswitch state: KILLSWITCH_STATE_NO_ADAPTER new_state: KILLSWITCH_STATE_UNBLOCKED
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: Setting device 100 (WWAN) to unblocked
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: device_changed_cb: Fake Manufacturer Fake Modem Model
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: killswitch state: KILLSWITCH_STATE_UNBLOCKED new_state: KILLSWITCH_STATE_SOFT_BLOCKED
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: <warning> Could not set Online property in oFono: GDBus.Error:org.ofono.Error.Failed: Operation failed
Aug 20 09:04:19 ubuntu-phablet NetworkManager[1633]: <warn> OFONO modem set enabled failed: (19) Method "SetProperty" with signature "sv" on interface "org.ofono.ConnectionManag
er" doesn't exist
Aug 20 09:04:19 ubuntu-phablet /03mmsproxy: Adding route for MMS connection /310410528924256/context2 on /ril_0 (rmnet_usb0)
Aug 20 09:04:19 ubuntu-phablet /03mmsproxy: failed to add route: org.freedesktop.DBus.Error.UnknownObject: Method "GetProperties" with signature "" on interface "org.ofono.Conne
ctionContext" doesn't exist
Aug 20 09:04:19 ubuntu-phablet kernel: [34624.654748] mmc0: mmc_start_bkops: Starting bkops
Aug 20 09:04:20 ubuntu-phablet kernel: [34626.169291] mdm_power_down_common: MDM2AP_STATUS never went low. Doing a hard reset
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Auto-activating connection '/310410528924256/context2'.
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) starting connection '/310410528924256/context2'
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> (/ril_0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) scheduled...
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) started...
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (...

I see the following output using those debs

2014-08-27 16:23:38,267 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseCarrier.qml:67:17: Unable to assign [undefined] to QObject*
2014-08-27 16:23:38,308 - WARNING - QOfonoNetworkOperator::registerOperator() failed: QDBusError("org.ofono.Error.AccessDenied", "Operation not permitted")
2014-08-27 16:23:38,308 - WARNING - registerComplete failed with error: org.ofono.Error.AccessDenied Operation not permitted Falling back to default
2014-08-27 16:24:12,488 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:268:5: QML Connections: Cannot assign to non-existent propert
y "onContextsChanged"
2014-08-27 16:24:12,493 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:55: TypeError: Cannot read property 'contexts' of undefined
2014-08-27 16:24:12,494 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseApn.qml:269:17: Unable to assign [undefined] to QObject*
pa

and this is syslog:

Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: Modem found: '/ril_0'
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: killswitch state: KILLSWITCH_STATE_NO_ADAPTER new_state: KILLSWITCH_STATE_UNBLOCKED
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: Setting device 100 (WWAN) to unblocked
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: device_changed_cb: Fake Manufacturer Fake Modem Model
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: killswitch state: KILLSWITCH_STATE_UNBLOCKED new_state: KILLSWITCH_STATE_SOFT_BLOCKED
Aug 20 09:04:19 ubuntu-phablet URfkill[22242]: <warning> Could not set Online property in oFono: GDBus.Error:org.ofono.Error.Failed: Operation failed
Aug 20 09:04:19 ubuntu-phablet NetworkManager[1633]: <warn> OFONO modem set enabled failed: (19) Method "SetProperty" with signature "sv" on interface "org.ofono.ConnectionManag
er" doesn't exist
Aug 20 09:04:19 ubuntu-phablet /03mmsproxy: Adding route for MMS connection /310410528924256/context2 on /ril_0 (rmnet_usb0)
Aug 20 09:04:19 ubuntu-phablet /03mmsproxy: failed to add route: org.freedesktop.DBus.Error.UnknownObject: Method "GetProperties" with signature "" on interface "org.ofono.Conne
ctionContext" doesn't exist
Aug 20 09:04:19 ubuntu-phablet kernel: [34624.654748] mmc0: mmc_start_bkops: Starting bkops
Aug 20 09:04:20 ubuntu-phablet kernel: [34626.169291] mdm_power_down_common: MDM2AP_STATUS never went low. Doing a hard reset
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Auto-activating connection '/310410528924256/context2'.
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) starting connection '/310410528924256/context2'
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> (/ril_0): device state change: disconnected -> prepare (reason 'none') [30 40 0]
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) scheduled...
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) started...
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> Activation (/ril_0) Stage 1 of 5 (Device Prepare) complete.
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <warn> OFONO connection failed: (32) Method "SetProperty" with signature "sv" on interface "org.ofono.ConnectionContext" doe
sn't exist
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> (/ril_0): device state change: prepare -> failed (reason 'unknown') [40 120 1]
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <warn> Activation (/ril_0) failed for connection '/310410528924256/context2'
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> (/ril_0): device state change: failed -> disconnected (reason 'none') [120 30 0]
Aug 20 09:04:21 ubuntu-phablet NetworkManager[1633]: <info> (/ril_0): deactivating device (reason 'none') [0]

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-28: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-08-29: Posted in a previous version of this proposal

#

OK, after extensive testing this should be good to go.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-08-29: Posted in a previous version of this proposal

#

I get a large number (>50) of these when I enter the APN panel
2014-08-29 08:58:11,004 - WARNING - file:///usr/share/ubuntu/settings/system/qml-plugins/cellular/PageChooseCarrier.qml:28:1: QML PageChooseCarrier: Binding loop detected for property "height"

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-08-29: Posted in a previous version of this proposal

#

actually the above happens when you scroll the page

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-08-29: Posted in a previous version of this proposal

#

note to test these debs you need latest from
https://launchpad.net/ubuntu/utopic/armhf/accountsservice-ubuntu-schemas/0.0.3+14.10.20140827-0ubuntu1

Other than the binding loop seems good

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-08-29: Posted in a previous version of this proposal

#

WFM (krillin, telenor)

review: Approve

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

CI is failing because you changed the carrierSelector from an ItemSelector to an OptionSelector but didn't change the tests to match.

review: Needs Fixing

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

Inline comment, typo in a visible string.

review: Needs Fixing

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-08-29: Posted in a previous version of this proposal

#

> I get a large number (>50) of these when I enter the APN panel
> 2014-08-29 08:58:11,004 - WARNING - file:///usr/share/ubuntu/settings/system
> /qml-plugins/cellular/PageChooseCarrier.qml:28:1: QML PageChooseCarrier:
> Binding loop detected for property "height"

This is a height property of the top level ItemPage which is not even being modified in PageChooseCarrier.qml at all. I would suspect it something to do with UITK or the OSK work that has gone in to the low levels.

If this does not affect the UX in any visible way, I would say it's totally minor and no reason to block the landing.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-29: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

You're anchoring the buttonRectangle to parent.bottom, which causes it to get pushed up above the input fields when the OSK is displayed. You should put it inside the flickable, so they stay below the inputs.

review: Needs Fixing

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

Testing on krillin, I can't get a working context for my t-mobile US SIM. Looking at the output of list-contexts, it isn't setting the value I entered for MessageCenter.

Looking at the upstart logs, I see this output when trying to set the context:
2014-08-29 15:39:19,973 - CRITICAL - Context error on /ril_0/context3: Invalid arguments in method call

review: Needs Fixing

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

After re-reading the MP description, I see that the failure I get above is consistent with bug 1362068. So apparently this can't work until we get that bug fixed?

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-29: Posted in a previous version of this proposal

#

The implementation is considerably different from the [1]design, has someone from design looked at this?

[1] https://wiki.ubuntu.com/Networking

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-09-04: Posted in a previous version of this proposal

#

Here's the design review.

------

Thanks for helping me get the APN settings going on my handset. For
your convenience, I've attached a couple of screenshots of what I see.
Comparing the current implementation with
<https://wiki.ubuntu.com/Networking#apn-mobile>:

* "On the carrier screen, the “APN” item should be insensitive
whenever the SIM is not associated with a carrier."

    When I'm in Flight Mode, (a) the carrier menu is empty, but (b) the
    "APN" item is still choosable. At least one of those is wrong
    (possibly both).

* On the APN screen, the radio lists are in Ubuntu shapes. If these
    are quick to remove, please remove them. Compare with the
    "Automatically"/"Manually" list on the Cellular screen, which
    looks much nicer.

* "The “Internet APN:” and “MMS APN:” radio lists should each consist
of: * a “None” item, if no APN is currently activated for that
connection type;..."

    On my handset, there are two items in the "Internet APN:" list, but
    neither of them are selected. If it's really true that no Internet
    APN is set on my phone, there should be a selected "None" item.

* Consequently, in the "MMS APN:" list, if I tap "Same APN as for
    Internet", I get a dialog: "Error: No Internet APN has been
    selected." Abolish this dialog, and instead just make that "Same
    APN" item insensitive whenever no Internet APN is selected.

* "Choosing “Custom Internet APN…” or “Custom MMS APN…” should open
the relevant dialog..."

    These screens are currently stack pages instead of dialogs. This
    means that I can enter some settings, complete or not, then tap
    the Back button, and it isn't clear whether those settings will be
    saved or not, which is pretty confusing. Even worse, in the "Custom
    MMS APN" screen, the "Password" field is hidden partly under the
    "Cancel" and "Save" buttons, and partly under the OSK. And the
    field labels are weirdly close to the left edge of the screen.

* "“Internet APN”, “MMS APN”, “MMSC”, and “Proxy” should be URL
fields (using the URL OSK and ignoring non-URL characters)..."

    Currently, "Internet APN", "MMS APN", "MMSC", and "Proxy" are all
    normal text fields, allowing impossible characters, and assuming
    that I want to capitalize and spell-check their contents when I do
    not.

* "...auto-inserting http:// on unfocus if no protocol was entered."

This doesn't happen.

* When I tap "Activate", even after entering a non-existent APN name,
the settings are apparently accepted without being tried.

Though I'm a perfectionist, I have a low bar for whether a feature is
better than nothing. But that last point is what makes me say no, this
isn't ready to land. If custom APNs aren't implemented at all yet, the
buttons and screens to specify them shouldn't be present, because
that's actively misleading. And if they are implemented, why is a
non-existent APN accepted?

Here's the design review.

------

Thanks for helping me get the APN settings going on my handset. For
your convenience, I've attached a couple of screenshots of what I see.
Comparing the current implementation with
<https://wiki.ubuntu.com/Networking#apn-mobile>:

*   "On the carrier screen, the “APN” item should be insensitive
    whenever the SIM is not associated with a carrier."

When I'm in Flight Mode, (a) the carrier menu is empty, but (b) the
    "APN" item is still choosable. At least one of those is wrong
    (possibly both).

*   On the APN screen, the radio lists are in Ubuntu shapes. If these
    are quick to remove, please remove them. Compare with the
    "Automatically"/"Manually" list on the Cellular screen, which
    looks much nicer.

*   "The “Internet APN:” and “MMS APN:” radio lists should each consist
    of: * a “None” item, if no APN is currently activated for that
    connection type;..."

On my handset, there are two items in the "Internet APN:" list, but
    neither of them are selected. If it's really true that no Internet
    APN is set on my phone, there should be a selected "None" item.

*   Consequently, in the "MMS APN:" list, if I tap "Same APN as for
    Internet", I get a dialog: "Error: No Internet APN has been
    selected." Abolish this dialog, and instead just make that "Same
    APN" item insensitive whenever no Internet APN is selected.

*   "Choosing “Custom Internet APN…” or “Custom MMS APN…” should open
    the relevant dialog..."

These screens are currently stack pages instead of dialogs. This
    means that I can enter some settings, complete or not, then tap
    the Back button, and it isn't clear whether those settings will be
    saved or not, which is pretty confusing. Even worse, in the "Custom
    MMS APN" screen, the "Password" field is hidden partly under the
    "Cancel" and "Save" buttons, and partly under the OSK. And the
    field labels are weirdly close to the left edge of the screen.

*   "“Internet APN”, “MMS APN”, “MMSC”, and “Proxy” should be URL
    fields (using the URL OSK and ignoring non-URL characters)..."

Currently, "Internet APN", "MMS APN", "MMSC", and "Proxy" are all
    normal text fields, allowing impossible characters, and assuming
    that I want to capitalize and spell-check their contents when I do
    not.

*   "...auto-inserting http:// on unfocus if no protocol was entered."

This doesn't happen.

*   When I tap "Activate", even after entering a non-existent APN name,
    the settings are apparently accepted without being tried.

Though I'm a perfectionist, I have a low bar for whether a feature is
better than nothing. But that last point is what makes me say no, this
isn't ready to land. If custom APNs aren't implemented at all yet, the
buttons and screens to specify them shouldn't be present, because
that's actively misleading. And if they are implemented, why is a
non-existent APN accepted?

Revision history for this message

Matthew Paul Thomas (mpt) wrote on 2014-09-08: Posted in a previous version of this proposal

#

Antti has explained to me the current asynchronous and uncommunicative API that makes validating a custom APN impossible to implement for MMS, and impractically difficult for Internet, at least without a new API. So I withdraw the last point, and instead suggest that "Activate" should be merely "OK" (since it won't be doing any activation right then).

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-02: Posted in a previous version of this proposal

#

> Here's the design review.
>
> ------
>
> Thanks for helping me get the APN settings going on my handset. For
> your convenience, I've attached a couple of screenshots of what I see.
> Comparing the current implementation with
> <https://wiki.ubuntu.com/Networking#apn-mobile>:
>
> * "On the carrier screen, the “APN” item should be insensitive
> whenever the SIM is not associated with a carrier."
>
> When I'm in Flight Mode, (a) the carrier menu is empty, but (b) the
> "APN" item is still choosable. At least one of those is wrong
> (possibly both).

Fixed both.

> * On the APN screen, the radio lists are in Ubuntu shapes. If these
> are quick to remove, please remove them. Compare with the
> "Automatically"/"Manually" list on the Cellular screen, which
> looks much nicer.

We could argue that the OptionSelector looks way better, but let's be consistently ugly ;)
Fixed.

> * "The “Internet APN:” and “MMS APN:” radio lists should each consist
> of: * a “None” item, if no APN is currently activated for that
> connection type;..."
>
> On my handset, there are two items in the "Internet APN:" list, but
> neither of them are selected. If it's really true that no Internet
> APN is set on my phone, there should be a selected "None" item.

Will land this separately when we get nuntium support for multiple MMS APN contexts.

> * Consequently, in the "MMS APN:" list, if I tap "Same APN as for
> Internet", I get a dialog: "Error: No Internet APN has been
> selected." Abolish this dialog, and instead just make that "Same
> APN" item insensitive whenever no Internet APN is selected.

Done. No more dialogs.

> * "Choosing “Custom Internet APN…” or “Custom MMS APN…” should open
> the relevant dialog..."
>
> These screens are currently stack pages instead of dialogs. This
> means that I can enter some settings, complete or not, then tap
> the Back button, and it isn't clear whether those settings will be
> saved or not, which is pretty confusing. Even worse, in the "Custom
> MMS APN" screen, the "Password" field is hidden partly under the
> "Cancel" and "Save" buttons, and partly under the OSK. And the
> field labels are weirdly close to the left edge of the screen.

jgdx takes care of this in a separate landing.

> * "“Internet APN”, “MMS APN”, “MMSC”, and “Proxy” should be URL
> fields (using the URL OSK and ignoring non-URL characters)..."
>
> Currently, "Internet APN", "MMS APN", "MMSC", and "Proxy" are all
> normal text fields, allowing impossible characters, and assuming
> that I want to capitalize and spell-check their contents when I do
> not.

I set the relevant hints, but seems the TextField is not validating based on them. We should at least now get a custom OSK for them.

> * "...auto-inserting http:// on unfocus if no protocol was entered."
>
> This doesn't happen.

Nope. Will either fix this on the next landing or file a medium bug.

> Here's the design review.
> 
> ------
> 
> Thanks for helping me get the APN settings going on my handset. For
> your convenience, I've attached a couple of screenshots of what I see.
> Comparing the current implementation with
> <https://wiki.ubuntu.com/Networking#apn-mobile>:
> 
> *   "On the carrier screen, the “APN” item should be insensitive
>     whenever the SIM is not associated with a carrier."
> 
>     When I'm in Flight Mode, (a) the carrier menu is empty, but (b) the
>     "APN" item is still choosable. At least one of those is wrong
>     (possibly both).

Fixed both.

> *   On the APN screen, the radio lists are in Ubuntu shapes. If these
>     are quick to remove, please remove them. Compare with the
>     "Automatically"/"Manually" list on the Cellular screen, which
>     looks much nicer.

We could argue that the OptionSelector looks way better, but let's be consistently ugly ;)
Fixed.

> *   "The “Internet APN:” and “MMS APN:” radio lists should each consist
>     of: * a “None” item, if no APN is currently activated for that
>     connection type;..."
> 
>     On my handset, there are two items in the "Internet APN:" list, but
>     neither of them are selected. If it's really true that no Internet
>     APN is set on my phone, there should be a selected "None" item.

Will land this separately when we get nuntium support for multiple MMS APN contexts.

> *   Consequently, in the "MMS APN:" list, if I tap "Same APN as for
>     Internet", I get a dialog: "Error: No Internet APN has been
>     selected." Abolish this dialog, and instead just make that "Same
>     APN" item insensitive whenever no Internet APN is selected.

Done. No more dialogs.

> *   "Choosing “Custom Internet APN…” or “Custom MMS APN…” should open
>     the relevant dialog..."
> 
>     These screens are currently stack pages instead of dialogs. This
>     means that I can enter some settings, complete or not, then tap
>     the Back button, and it isn't clear whether those settings will be
>     saved or not, which is pretty confusing. Even worse, in the "Custom
>     MMS APN" screen, the "Password" field is hidden partly under the
>     "Cancel" and "Save" buttons, and partly under the OSK. And the
>     field labels are weirdly close to the left edge of the screen.

jgdx takes care of this in a separate landing.

> *   "“Internet APN”, “MMS APN”, “MMSC”, and “Proxy” should be URL
>     fields (using the URL OSK and ignoring non-URL characters)..."
> 
>     Currently, "Internet APN", "MMS APN", "MMSC", and "Proxy" are all
>     normal text fields, allowing impossible characters, and assuming
>     that I want to capitalize and spell-check their contents when I do
>     not.

I set the relevant hints, but seems the TextField is not validating based on them. We should at least now get a custom OSK for them.

> *   "...auto-inserting http:// on unfocus if no protocol was entered."
> 
>     This doesn't happen.

Nope. Will either fix this on the next landing or file a medium bug.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-02: Posted in a previous version of this proposal

#

> Antti has explained to me the current asynchronous and uncommunicative API
> that makes validating a custom APN impossible to implement for MMS, and
> impractically difficult for Internet, at least without a new API. So I
> withdraw the last point, and instead suggest that "Activate" should be merely
> "OK" (since it won't be doing any activation right then).

For Internet it's "Activate" as that we can actually try to activate but don't get any feedback if it succeeds or not. If the config is bad, NM starts to try the other available APNs until it either finds one that works or gives up. You see the selected APN changing in the list while NM does it's magic.

For MMS it's "Save" as that is what it does.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-02: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-02: Posted in a previous version of this proposal

#

APN editor: Buttons stay pressed after first tap:
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376696

APN editor: Grey selection box when tapping just below/above the last/first entry.
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376713

APN editor: Pressing enter key should shift focus to next field.
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376714

APN editor: Selected APN states don't persist on exit and re-entry
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376720

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-02: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-02: Posted in a previous version of this proposal

#

Please put the button rectangle inside the flickable instead of anchoring the flickable to the top. We've run into this problem in a number of places in other plugins, putting them inside the flickable has worked out much better.

Please see inline comments

review: Needs Fixing

Revision history for this message

Jonas G. Drange (jonas-drange) wrote on 2014-10-02: Posted in a previous version of this proposal

#

Could you quickly improve the throwing of exceptions? It might be a bit cryptic as it is?

Also, I added a comment about the tmp variable not being a copy (forgive me if that was intended) and a small inconsistency referring to the __suppress… flag.

See inline comments.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-02: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-03: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:982
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1603/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5487/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/795
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5188/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3295
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4237/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-03:

#

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

review: Needs Fixing (continuous-integration)

lp:~unity-api-team/ubuntu-system-settings/apneditor updated on 2014-10-04

1111. By Launchpad Translations on behalf of system-settings-touch on 2014-10-04: Launchpad automatic translations update.

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-10-04:

#

Installed packages from the silo and tested the UI.
I made a test apn that did not work and the selection for active went back to the original.

My second sim has no signal so the UI did not enable the APN editing option which I assume is intended.

It occurs to me there seems to be a flaw in the general UI. If "Same APN as for internet" is enabled then the custom internet APN page needs to include the MMS settings.

The custom panel was supposed to be pre-populated with the currently active APN information.
Choosing “Custom Internet APN…” or “Custom MMS APN…” should open the relevant dialog, pre-filled with the details of the already-selected APN so that you can view, tweak, or replace them as necessary.

I wonder if we should also show the protocol field as IPv4 without an option to change it.

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-10-04:

#

I tried to make a custom Internet APN that matched the active one and it would not be accepted

Context2 below is what is being used, context3 I made. Note the "settings" are missing from our editor,not sure if they are required.

[ /ril_0 ]
    [ /ril_0/context1 ]
        IPv6.Settings = { }
        Password =
        Settings = { }
        MessageCenter = http://mmsc.mobile.att.net
        MessageProxy = proxy.mobile.att.net:80
        Type = internet
        Username =
        Active = 0
        Name = ATT Phone
        Protocol = ip
        AccessPointName = nxtgenphone

    [ /ril_0/context2 ]
        IPv6.Settings = { }
        Password =
        Settings = { Gateway=10.208.157.220 DomainNameServers=172.16.145.103,172.16.145.103, Netmask=255.255.255.0 Method=static Address=10.208.157.220 Interface=ccmni0 }
        MessageCenter = http://mmsc.cingular.com/
        MessageProxy = wireless.cingular.com
        Type = internet
        Username =
        Active = 1
        Name = ATT WAP
        Protocol = ip
        AccessPointName = wap.cingular

    [ /ril_0/context3 ]
        IPv6.Settings = { }
        Password =
        Settings = { }
        Type = internet
        Username =
        Active = 0
        Name = ___ubuntu_custom_apn_internet
        Protocol = ip
        AccessPointName = wap.cingular

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-10-04:

#

T-Mobile users simply need to create a custom apn with a change of protocol from ipv6 to ip(v4). The UI will not be clear to them, they will see a custom APN that looks the same as their current APN since we do not show the protocol field. Be nice to illustrate the faulty setting perhaps.

[ /ril_1 ]
    [ /ril_1/context1 ]
        Username =
        Settings = { }
        Protocol = ipv6
        AccessPointName = fast.t-mobile.com
        IPv6.Settings = { }
        Active = 0
        Name = T-Mobile GPRS
        MessageProxy =
        MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
        Password =
        Type = internet

lp:~unity-api-team/ubuntu-system-settings/apneditor updated on 2014-10-06

1112. By Launchpad Translations on behalf of system-settings-touch on 2014-10-05: Launchpad automatic translations update.
1113. By Launchpad Translations on behalf of system-settings-touch on 2014-10-06: Launchpad automatic translations update.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06: Posted in a previous version of this proposal

#

Fixed by the review comments in r980. The only non-trivial comments are:

Ken VanDine (ken-vandine) wrote:
> I think you shouldn't be anchoring to the buttonRectangle,
> the buttonRectangle should be in the Flickable.

Yes. I know, but in this case the user usually just enters two of the top fields and having the buttons always visible has some value. I took great care on verifying that the buttons react properly on the viewport changes. If I get it to break on my last testing round, then I will put the buttons inside the flickable, OK?

Ken VanDine (ken-vandine) wrote:
> Does this really return an empty list?
> Perhaps it would be safer to set connections to a QStringList()

the connection list is an array of object paths. QDBusPendingReply quarantees that .value() returns a default constructed T, which in this case is an empty array of dbus-paths.

For the logic that follows it's really irrelevant if an empty list is received (that is also a valid reply).

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06: Posted in a previous version of this proposal

#

Now resolving merge conflicts.
IMHO the dynamic SIM logic is a bit broken, but it's more or less a design question. Let's continue on that after this MP is in.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06:

#

> Installed packages from the silo and tested the UI.
> I made a test apn that did not work and the selection for active went back to
> the original.

OK, this needs a bit more investigating. Was it an Internet APN or MMS?
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376720

possible causes: ofono not updating the Active properties correctly, NM not setting the Active properties correctly, APN editor not reacting to the Active properties correctly.

> My second sim has no signal so the UI did not enable the APN editing option
> which I assume is intended.

Yes, you can only access the APN editor page if your phone is registered to a network.

> It occurs to me there seems to be a flaw in the general UI. If "Same APN as
> for internet" is enabled then the custom internet APN page needs to include
> the MMS settings.
>
> The custom panel was supposed to be pre-populated with the currently active
> APN information.
> Choosing “Custom Internet APN…” or “Custom MMS APN…” should open the relevant
> dialog, pre-filled with the details of the already-selected APN so that you
> can view, tweak, or replace them as necessary.

This is for provisioned APN's. The ones that come from ofono and android provider database. Such Internet APNs can and do define shared APN's. You can't create one right now through the UI. If the provisioning fails for both Internet and MMS, then yes, the user would need to create two separate APN's (one for Internet, one for MMS).

We don't allow editing of the provisioned APNs (for now). There is only one Custom APN which is separate from the provisioned ones.

The whole "use the same values as for Internet" in the MMS editor was getting so messy that I disabled that toggle for now. We should enable that once we allow editing of the provisioned APNs.

> I wonder if we should also show the protocol field as IPv4 without an option
> to change it.

My opinion this would be that we keep it hidden until we actually support both.

> Installed packages from the silo and tested the UI.
> I made a test apn that did not work and the selection for active went back to
> the original.

OK, this needs a bit more investigating. Was it an Internet APN or MMS?
https://bugs.launchpad.net/ubuntu/+source/ubuntu-system-settings/+bug/1376720

possible causes: ofono not updating the Active properties correctly, NM not setting the Active properties correctly, APN editor not reacting to the Active properties correctly.

> My second sim has no signal so the UI did not enable the APN editing option
> which I assume is intended.

Yes, you can only access the APN editor page if your phone is registered to a network.

> It occurs to me there seems to be a flaw in the general UI. If "Same APN as
> for internet" is enabled then the custom internet APN page needs to include
> the MMS settings.
> 
> The custom panel was supposed to be pre-populated with the currently active
> APN information.
> Choosing “Custom Internet APN…” or “Custom MMS APN…” should open the relevant
> dialog, pre-filled with the details of the already-selected APN so that you
> can view, tweak, or replace them as necessary.

This is for provisioned APN's. The ones that come from ofono and android provider database. Such Internet APNs can and do define shared APN's. You can't create one right now through the UI. If the provisioning fails for both Internet and MMS, then yes, the user would need to create two separate APN's (one for Internet, one for MMS).

We don't allow editing of the provisioned APNs (for now). There is only one Custom APN which is separate from the provisioned ones.

The whole "use the same values as for Internet" in the MMS editor was getting so messy that I disabled that toggle for now. We should enable that once we allow editing of the provisioned APNs.

> I wonder if we should also show the protocol field as IPv4 without an option
> to change it.

My opinion this would be that we keep it hidden until we actually support both.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06:

#

> I tried to make a custom Internet APN that matched the active one and it would
> not be accepted

:/

> Context2 below is what is being used, context3 I made. Note the "settings" are
> missing from our editor,not sure if they are required.
>
> [ /ril_0 ]
> [ /ril_0/context1 ]
> IPv6.Settings = { }
> Password =
> Settings = { }
> MessageCenter = http://mmsc.mobile.att.net
> MessageProxy = proxy.mobile.att.net:80
> Type = internet
> Username =
> Active = 0
> Name = ATT Phone
> Protocol = ip
> AccessPointName = nxtgenphone
>
> [ /ril_0/context2 ]
> IPv6.Settings = { }
> Password =
> Settings = { Gateway=10.208.157.220
> DomainNameServers=172.16.145.103,172.16.145.103, Netmask=255.255.255.0
> Method=static Address=10.208.157.220 Interface=ccmni0 }
> MessageCenter = http://mmsc.cingular.com/
> MessageProxy = wireless.cingular.com
> Type = internet
> Username =
> Active = 1
> Name = ATT WAP
> Protocol = ip
> AccessPointName = wap.cingular
>
> [ /ril_0/context3 ]
> IPv6.Settings = { }
> Password =
> Settings = { }
> Type = internet
> Username =
> Active = 0
> Name = ___ubuntu_custom_apn_internet
> Protocol = ip
> AccessPointName = wap.cingular

the data looks valid, it's just the static DNS and IP assignments that worry me. We don't support that in the editor right now. I'll finish my testing as it could be that you have just unlucky settings on your SIM that we can't support right now.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06:

#

> T-Mobile users simply need to create a custom apn with a change of protocol
> from ipv6 to ip(v4). The UI will not be clear to them, they will see a custom
> APN that looks the same as their current APN since we do not show the protocol
> field. Be nice to illustrate the faulty setting perhaps.
>
> [ /ril_1 ]
> [ /ril_1/context1 ]
> Username =
> Settings = { }
> Protocol = ipv6
> AccessPointName = fast.t-mobile.com
> IPv6.Settings = { }
> Active = 0
> Name = T-Mobile GPRS
> MessageProxy =
> MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
> Password =
> Type = internet

Is that above now faulty or not?

So, this is an automatically provisioned APN, right? As I said above, we don't currently support editing provisioned APNs. Instead we should modify the file we use for provisioning and change the protocol there directly.

OR if we now do support also IPv6 APNs then we must include the protocol field to the editor.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-06:

#

It's not activating my custom internet APN for t-mobile. After creating it, it goes back out and neither are selected. After a few seconds the provisioned APN is selected again instead of the custom. Here's the output of list-contexts:

[ /ril_0 ]
    [ /ril_0/context1 ]
        Name = T-Mobile GPRS
        Password =
        IPv6.Settings = { }
        Type = internet
        Settings = { Netmask=255.255.255.0 DomainNameServers=10.177.0.34,10.163.103.140, Method=static Gateway=33.97.153.25 Interface=rmnet_usb0 Address=33.97.153.24 }
        Protocol = ip
        AccessPointName = fast.t-mobile.com
        Username =
        MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
        MessageProxy =
        Active = 1

    [ /ril_0/context2 ]
        Name = ___ubuntu_custom_apn_internet
        Password =
        IPv6.Settings = { }
        Type = internet
        Settings = { }
        Protocol = ip
        AccessPointName = fast.t-mobile.com
        Username =
        Active = 0

    [ /ril_0/context3 ]
        Name = ___ubuntu_custom_apn_mms
        Password =
        IPv6.Settings = { }
        Type = mms
        Settings = { }
        Protocol = ip
        AccessPointName = fast.t-mobile.com
        Username =
        MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
        MessageProxy =
        Active = 0

review: Needs Information

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-06:

#

> It's not activating my custom internet APN for t-mobile. After creating it,
> it goes back out and neither are selected. After a few seconds the
> provisioned APN is selected again instead of the custom. Here's the output of
> list-contexts:
>
> [ /ril_0 ]
> [ /ril_0/context1 ]
> Name = T-Mobile GPRS
> Password =
> IPv6.Settings = { }
> Type = internet
> Settings = { Netmask=255.255.255.0
> DomainNameServers=10.177.0.34,10.163.103.140, Method=static
> Gateway=33.97.153.25 Interface=rmnet_usb0 Address=33.97.153.24 }
> Protocol = ip
> AccessPointName = fast.t-mobile.com
> Username =
> MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
> MessageProxy =
> Active = 1
>
> [ /ril_0/context2 ]
> Name = ___ubuntu_custom_apn_internet
> Password =
> IPv6.Settings = { }
> Type = internet
> Settings = { }
> Protocol = ip
> AccessPointName = fast.t-mobile.com
> Username =
> Active = 0
>
> [ /ril_0/context3 ]
> Name = ___ubuntu_custom_apn_mms
> Password =
> IPv6.Settings = { }
> Type = mms
> Settings = { }
> Protocol = ip
> AccessPointName = fast.t-mobile.com
> Username =
> MessageCenter = http://mms.msg.eng.t-mobile.com/mms/wapenc
> MessageProxy =
> Active = 0

We identified a NM bug which prevents activating Custom Internet APN if there already is a provisioned one active at the same time.

There also was a bug in switching between multiple provisioned Internet APNs, now fixed in the branch.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-06:

#

I'll approve the code, it seems to work in the case where the user doesn't have a context that can be activated. I want to wait until we triage the NM bug before top approving and preparing to land.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-06:

#

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

review: Needs Fixing (continuous-integration)

lp:~unity-api-team/ubuntu-system-settings/apneditor updated on 2014-10-07

1114. By Launchpad Translations on behalf of system-settings-touch on 2014-10-07: Launchpad automatic translations update.

Revision history for this message

Mathieu Trudel-Lapierre (cyphermox) wrote on 2014-10-07:

#

I think the activation of new contexts should also be fixed at the APN editor level. You should be able to explicitly Disconnect an interface if it's found to currently be connected as per NetworkManager, without having to bother with which context was activated. Once disconnected, you would be able to freely activate a new context.

The issue with doing automatic deactivation just before activating a new context in NM directly is that all of these are time-sensitive operations; and can't be run synchronously (otherwise it would cause visible delays when you try to activate the connection and weird behavior in the indicators). When running them async; it's still possible for the disconnect to be delayed enough that the deactivation of the old context and activation of the new one to happen pretty much simultaneously; in other words, you'll still risk failure cases; which can be safely avoided by explicitly disconnecting the device and connecting a new context altogether when trying to activate a newly-created context.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-07:

#

I agree with what Mathieu said, we should handle it in the apneditor. Fixing it in NM is nice too, but we should still do the disconnect ourselves.

review: Needs Fixing

lp:~unity-api-team/ubuntu-system-settings/apneditor updated on 2014-10-09

1115. By Jonas G. Drange on 2014-10-07: [wifi/phone] dynamically chooses what SIM to use when there's only one present. Fixes: 1375832
Approved by: Ken VanDine, PS Jenkins bot
1116. By PS Jenkins bot on 2014-10-07: Releasing 0.3+14.10.20141007-0ubuntu1
1117. By Launchpad Translations on behalf of system-settings-touch on 2014-10-08: Launchpad automatic translations update.
1118. By Launchpad Translations on behalf of system-settings-touch on 2014-10-09: Launchpad automatic translations update.
1119. By Ken VanDine on 2014-10-09: merged apneditor

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-09:

#

FAILED: Continuous integration, rev:988
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1627/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5748/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/819
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5410/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7000
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7000/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3381
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4339
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4339/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-09:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Pat McGowan (pat-mcgowan) wrote on 2014-10-10:

#

When there is no working APN I can define and activate a new Internet APN
When there is a working APN, no other APNs will activate

I can define an MMS APN which matches the existing working dual internet/mms APN, but it will not activate. The UI shows it selected however.
I suspect that AT&T may not support activating 2 different APNs and the UI should support defining an internet apn that does both.

The custom internet apn screen offers cancel and activate while the mms screen offers cancel and save.

Revision history for this message

Antti Kaijanmäki (kaijanmaki) wrote on 2014-10-10:

#

> When there is no working APN I can define and activate a new Internet APN
> When there is a working APN, no other APNs will activate

Are the other APNs valid? You can only activate a valid APN.

> I can define an MMS APN which matches the existing working dual internet/mms
> APN, but it will not activate. The UI shows it selected however.

MMS APNs activate only for a short period of time when MMS message is either sent or received. ofono Activate is not applicable here. The selection is correct, as you only have a single MMS context, so that one is the one that nuntium will use.

> The custom internet apn screen offers cancel and activate while the mms screen
> offers cancel and save.

This is agreed with mpt, I though the design has also been updated. Internet APN can be activated, but MMS apn can only be saved. hence the difference.

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-10-10:

#

I think we need to get this landed and iterate to improve it. It seems to create a valid APN for some networks.

review: Approve

ubuntu-system-settings

Merge lp:~unity-api-team/ubuntu-system-settings/apneditor into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'plugins/cellular/CMakeLists.txt'
 --- plugins/cellular/CMakeLists.txt	2014-08-17 14:50:51 +0000
 +++ plugins/cellular/CMakeLists.txt	2014-10-09 14:10:12 +0000
@@ -4,6 +4,8 @@
  install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
  set(QML_SOURCES
++    CustomApnEditor.qml
++    PageChooseApn.qml
      PageChooseCarrier.qml
      PageChooseCarriers.qml
      PageComponent.qml
@@ -18,6 +20,8 @@
    plugin.h
    hotspotmanager.cpp
    hotspotmanager.h
++  ofonoactivator.cpp
++  ofonoactivator.h
    nm_manager_proxy.h
    nm_settings_proxy.h
    nm_settings_connection_proxy.h
 === modified file 'plugins/cellular/Components/CMakeLists.txt'
 --- plugins/cellular/Components/CMakeLists.txt	2014-08-21 20:25:08 +0000
 +++ plugins/cellular/Components/CMakeLists.txt	2014-10-09 14:10:12 +0000
@@ -9,3 +9,9 @@
      SimEditor.qml
+ )
  install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular/Components)
++
++# add a phony target to get the files visible in Qt Creator.
++add_custom_target(
++    plugins_cellular_components_sources
++    SOURCES ${QML_SOURCES}
++)
 === modified file 'plugins/cellular/Components/MultiSim.qml'
 --- plugins/cellular/Components/MultiSim.qml	2014-08-19 23:24:04 +0000
 +++ plugins/cellular/Components/MultiSim.qml	2014-10-09 14:10:12 +0000
@@ -33,7 +33,7 @@
      property var settings: phoneSettings
      CellularMultiSim {
--        anchors { left: parent.left; right: parent.right }
++        anchors { left: parent.left; right: parent.right }
+     }
      ListItem.Divider {}
@@ -79,13 +79,13 @@
      ListItem.Divider {}
      SimEditor {
--        anchors { left: parent.left; right: parent.right }
++        anchors { left: parent.left; right: parent.right }
+     }
      ListItem.Divider {}
      DefaultSim {
--        anchors { left: parent.left; right: parent.right }
++        anchors { left: parent.left; right: parent.right }
+     }
      GSettings {
@@ -99,7 +99,7 @@
              if (!simNames[m0]) {
                  simNames[m0] = "SIM 1";
+             }
--            if (!simNames[m1]) {
++            if (!simNames[m1]) {
                  simNames[m1] = "SIM 2";
+             }
              phoneSettings.simNames = simNames;
 === modified file 'plugins/cellular/Components/SingleSim.qml'
 --- plugins/cellular/Components/SingleSim.qml	2014-08-22 10:53:16 +0000
 +++ plugins/cellular/Components/SingleSim.qml	2014-10-09 14:10:12 +0000
@@ -28,10 +28,10 @@
      property var sim
      CellularSingleSim {
--        anchors { left: parent.left; right: parent.right }
++        anchors { left: parent.left; right: parent.right }
+     }
--    ListItem.Divider {}
++    ListItem.Divider {}
      ListItem.SingleValue {
          text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
@@ -60,9 +60,10 @@
          objectName: "chooseCarrier"
          progression: enabled
          value: sim.netReg.name || i18n.tr("N/A")
++        enabled: sim.netReg.status !== ""
          onClicked: {
              pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
--                netReg: sim.netReg,
++                sim: sim,
                  title: i18n.tr("Carrier")
              })
+         }
 === added file 'plugins/cellular/CustomApnEditor.qml'
 --- plugins/cellular/CustomApnEditor.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/CustomApnEditor.qml	2014-10-09 14:10:12 +0000
@@ -0,0 +1,326 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * Contact: Pat McGowan <pat.mcgowan@canonical.com>
++ *
++ * 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 QtQuick.Layouts 1.1
++import SystemSettings 1.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++
++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;
++
++    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"
++    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"]
++        }
++
++        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
++        anchors {
++            top: parent.top
++            left: parent.left
++            right: parent.right
++            bottom: parent.bottom
++            margins: 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
++                }
++                /// @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;
++                        }
++                    }
++                }
++            }
++
++            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 {
++                    text: i18n.tr("MMSC")
++                    visible: d.isMms
++                }
++                TextField {
++                    id: mmsc
++                    visible: d.isMms
++                    onTextChanged: d.validateFields()
++                    inputMethodHints: Qt.ImhUrlCharactersOnly | Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
++                }
++                Label {
++                    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: "Port"
++                    visible: d.isMms
++                }
++                TextField {
++                    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 {
++                    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;
++                        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;
++                        }
++
++                        ctx.accessPointName = apnName.text;
++                        ctx.username = userName.text;
++                        ctx.password = pword.text;
++                        if (d.isMms) {
++                            ctx.messageCenter = mmsc.text;
++                            var proxyValue = "";
++                            if (proxy.text !== "") {
++                                proxyValue = proxy.text;
++                                if (port.text !== "")
++                                    proxyValue = proxyValue + ":" + port.text;
++                            }
++                            ctx.messageProxy = proxyValue
++                        }
++                        /// @todo map protocol values
++
++                        activateCb(ctx.type, ctx.contextPath);
++                        pageStack.pop();
++                    }
++                }
++            } // item for buttons
++        } // the contents
++    } // the flickable
++}
 === added file 'plugins/cellular/PageChooseApn.qml'
 --- plugins/cellular/PageChooseApn.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/PageChooseApn.qml	2014-10-09 14:10:12 +0000
@@ -0,0 +1,610 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * Contact: Pat McGowan <pat.mcgowan@canonical.com>
++ *
++ * 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 SystemSettings 1.0
++import Ubuntu.Components 1.1
++import Ubuntu.Components.Popups 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++import MeeGo.QOfono 0.2
++import Ubuntu.SystemSettings.Cellular 1.0
++
++ItemPage {
++    id: root
++    title: i18n.tr("APN")
++    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;
++
++        function isEmptyCustom (type, ctx)
++        {
++            /* OK, this sucks _hard_,
++             * QOfono does not return the added context, so instead we have to "figure it out"
++             * by looking for "contextAdded" for totally empty context with default Name values.
++             * LP(#1361864)
++             */
++
++            var targetName = "";
++            var targetAccessPointName = "";
++            if (type === "internet") {
++                targetName = "Internet";
++                targetAccessPointName = "";
++            } else if (type == "mms") {
++                targetName = "MMS";
++                targetAccessPointName = "";
++            }
++
++            if (ctx.type === type &&
++                ctx.name === targetName &&
++                ctx.accessPointName === targetAccessPointName)
++                return true;
++            return false;
++        }
++
++        function updateContexts()
++        {
++            var tmp = 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;
++
++                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
++            // 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()
++        {
++            var customInternet = Object.keys(mContexts).filter(function (i) {
++                var ctx = mContexts[i];
++                return ctx.name === mCustomContextNameInternet ||
++                       isEmptyCustom("internet", ctx);
++            });
++            var customMms = Object.keys(mContexts).filter(function (i) {
++                var ctx = mContexts[i];
++                return ctx.name === mCustomContextNameMms ||
++                       isEmptyCustom("mms", ctx);
++            });
++
++            // 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) {
++                sim.connMan.addContext("internet");
++            }
++
++            // @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;
++
++            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
++                           });
++        }
++
++        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
++    }
++
++    Component {
++        id: connCtx
++        OfonoContextConnection {
++
++            // add helper property to detect dual internet/MMS contexts
++            property bool dual : false
++            Component.onCompleted:{
++                if (type == "internet")
++                    if (messageCenter !== "")
++                        dual = true
++            }
++
++            onActiveChanged: if (type === "internet") internetApnSelector.updateSelectedIndex()
++            onNameChanged: d.buildLists()
++            onAccessPointNameChanged: d.buildLists()
++            onReportError: console.error("Context error on " + contextPath + ": " + errorString)
++        }
++    }
++
++    Connections {
++        target: sim.connMan
++        onContextsChanged: d.updateContexts()
++
++        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
++            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);
++            });
++
++
++            // do this once.
++            d.checkAndCreateCustomContexts();
++        }
++    }
++
++    Flickable {
++        id: scrollWidget
++        anchors.fill: parent
++        contentHeight: contentItem.childrenRect.height
++        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"
++                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()
++
++                    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);
++                    }
++                }
++            }
++            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"
++                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") {
++                                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
++                    }
++                }
++            }
++            ListItem.SingleControl {
++                control: Button {
++                    objectName: "customApnEdit"
++                    text: i18n.tr("Custom MMS APN…")
++                    width: parent.width - units.gu(4)
++                    onClicked: 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
++
++                 }
++             }
++
++         }
++    }
++}
 === modified file 'plugins/cellular/PageChooseCarrier.qml'
 --- plugins/cellular/PageChooseCarrier.qml	2014-07-24 19:00:45 +0000
 +++ plugins/cellular/PageChooseCarrier.qml	2014-10-09 14:10:12 +0000
@@ -19,55 +19,103 @@
   */
  import QtQuick 2.0
++import QtQuick.Layouts 1.1
  import SystemSettings 1.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1 as ListItem
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
  import MeeGo.QOfono 0.2
  ItemPage {
--    title: title
++    id: root
++    title: i18n.tr("Carrier")
++
      objectName: "chooseCarrierPage"
--    property var netReg
--    property var operators: []
--    property bool scanning: false
++    property var sim
++
      property variant operatorNames
--    property variant operatorStatus
--    property int curOp
--    Component.onCompleted: buildLists();
++    property int mode
++
++    QtObject {
++        id: d
++        property bool __suppressActivation : true;
++    }
++
++    Component.onCompleted: {
++        updateNetworkOperators();
++    }
      Connections {
--        target: netReg
--        onStatusChanged: {
--            if (netReg.status === "registered")
--                buildLists();
--        }
--        onNetworkOperatorsChanged: buildLists();
--        onScanFinished: scanning = false;
--        onScanError: {
--            scanning = false;
--            console.warn ("onScanError: " + message);
--        }
++        target: sim.netReg
++        onNetworkOperatorsChanged: updateNetworkOperators();
++        onCurrentOperatorPathChanged: buildLists();
++    }
++
++    // map of operatorPath : netOp
++    property var operators: ({})
++    function updateNetworkOperators()
++    {
++        var tmp = sim.netReg.networkOperators;
++        var added = tmp.filter(function(i) {
++            return operators[i] === undefined;
++        });
++        var removed = Object.keys(operators).filter(function(i) {
++            return tmp.indexOf(i) === -1;
++        })
++
++        removed.forEach(function(currentValue, index, array) {
++            // just asserting to verify the logic
++            // remove once proven functional
++            if (operators[currentValue] === undefined) {
++                throw "updateNetworkOperators: removed is broken";
++            }
++
++            operators[currentValue].destroy();
++            delete operators[currentValue];
++        });
++
++        added.forEach(function(currentValue, index, array) {
++            // just asserting to verify the logic
++            // remove once proven functional
++            if (operators[currentValue] !== undefined) {
++                throw "updateNetworkOperators: added is broken";
++            }
++
++            operators[currentValue] = netOp.createObject(parent,
++                                                         {
++                                                             "operatorPath": currentValue
++                                                         });
++        });
++
++        // just asserting to verify the logic
++        // remove once proven functional
++        if (Object.keys(operators).length !== tmp.length) {
++            throw "Object.keys(operators).length !== tmp.length";
++        }
++        tmp.forEach(function(currentValue, index, array) {
++            if (operators[currentValue] === undefined)
++                throw "operators[currentValue] === undefined";
++        });
++
++        buildLists();
+     }
      function buildLists()
+     {
--        var ops = [];
++        d.__suppressActivation = true;
          var oN = new Array();
--        var oS = new Array();
--        for (var i = 0; i < netReg.networkOperators.length; i++) {
--            var tempOp = netOp.createObject(parent, {"operatorPath": netReg.networkOperators[i]});
++
++        for (var i in operators) {
++            var tempOp = operators[i];
              if (tempOp.status === "forbidden")
                  continue
              oN.push(tempOp.name);
--            oS.push(tempOp.status);
--            ops.push(tempOp)
+         }
--        curOp = oS.indexOf("current");
          operatorNames = oN;
--        operatorStatus = oS;
--        operators = ops;
--        carrierSelector.selectedIndex = curOp;
++
++        var cur = operators[sim.netReg.currentOperatorPath];
++        carrierSelector.selectedIndex = cur === undefined ? -1 : operatorNames.indexOf(cur.name);
++        d.__suppressActivation = false;
+     }
      Component {
@@ -78,78 +126,113 @@
                      console.warn("registerComplete failed with error: " + errorString);
                  } else if (error !== OfonoNetworkOperator.NoError) {
                      console.warn("registerComplete failed with error: " + errorString + " Falling back to default");
--                    netReg.registration();
++                    sim.netReg.registration();
+                 }
+             }
++            onNameChanged:  buildLists();
++            onStatusChanged: buildLists();
+         }
+     }
      Flickable {
++        id: scrollWidget
          anchors.fill: parent
          contentWidth: parent.width
          contentHeight: parent.height
          boundsBehavior: (contentHeight > parent.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
--        Column {
--            anchors.left: parent.left
--            anchors.right: parent.right
++        ColumnLayout {
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
              ListItem.ItemSelector {
                  id: chooseCarrier
                  objectName: "autoChooseCarrierSelector"
                  expanded: true
--                enabled: netReg.mode !== "auto-only"
++                enabled: sim.netReg.mode !== "auto-only"
                  text: i18n.tr("Choose carrier:")
                  model: [i18n.tr("Automatically"), i18n.tr("Manually")]
--                selectedIndex: netReg.mode === "manual" ? 1 : 0
++
++                delegate: OptionSelectorDelegate { showDivider: false }
++                selectedIndex: sim.netReg.mode === "manual" ? 1 : 0
++
++                // we only want to do this per user input
                  onSelectedIndexChanged: {
--                    if (selectedIndex === 0)
--                        netReg.registration();
++                    if (selectedIndex === -1 || d.__suppressActivation)
++                        return;
++
++                    if (selectedIndex === 0) {
++                        sim.netReg.registration();
++                    } else if (selectedIndex === 1) {
++                        if (sim.netReg.status !== "searching")
++                            sim.netReg.scan();
++                    }
+                 }
+             }
--
--            ListItem.ItemSelector {
--                id: carrierSelector
--                objectName: "carrierSelector"
--                expanded: enabled
++            ListItem.SingleControl {
                  enabled: chooseCarrier.selectedIndex === 1
--                model: operatorNames
--                onSelectedIndexChanged: {
--                    if ((selectedIndex !== curOp) && operators[selectedIndex]) {
--                        operators[selectedIndex].registerOperator();
--                    }
--                }
--            }
--        }
--
--        ListItem.SingleControl {
--            anchors.bottom: parent.bottom
--            control: Button {
--                objectName: "refreshButton"
--                width: parent.width - units.gu(4)
--                text: i18n.tr("Refresh")
--                enabled: (netReg.status !== "searching") && (netReg.status !== "denied")
--                onTriggered: {
--                    scanning = true;
--                    netReg.scan();
--                }
--            }
--        }
--
--        ActivityIndicator {
--            id: activityIndicator
--            anchors.centerIn: parent
--            running: scanning
--        }
--
--        Label {
--            anchors {
--                top: activityIndicator.bottom
--                topMargin: units.gu(2)
--                horizontalCenter: activityIndicator.horizontalCenter
--            }
--            text: i18n.tr("Searching")
--            visible: activityIndicator.running
++                anchors {
++                    left: parent.left
++                    leftMargin: units.gu(0)
++                }
++                control: ColumnLayout {
++                    id: child
++                    width: parent.width - units.gu(4)
++                    anchors.left: parent.left
++                    RowLayout {
++                        id: searchingRow
++                        spacing: units.gu(1)
++
++                        visible: sim.netReg.status === "searching"
++                        ActivityIndicator {
++                            id: activityIndicator
++                            anchors.verticalCenter: parent.verticalCenter
++                            running: parent.visible
++                        }
++                        Label {
++                            anchors.verticalCenter: parent.verticalCenter
++                            text: i18n.tr("Searching for carriers…")
++                        }
++                    }
++                    ListItem.ItemSelector {
++                        id: carrierSelector
++                        objectName: "carrierSelector"
++                        expanded: true
++                        enabled: sim.netReg.status !== "searching" && chooseCarrier.selectedIndex === 1
++                        // work around ItemSelector not having a visual change depending on being disabled
++                        opacity: enabled ? 1.0 : 0.5
++                        width: parent.width
++                        model: operatorNames
++                        delegate: OptionSelectorDelegate { enabled: carrierSelector.enabled; showDivider: false }
++                        onSelectedIndexChanged: {
++                            if (selectedIndex === -1 || d.__suppressActivation)
++                                return;
++
++                            // this assumes operator names are unique,
++                            // revise if not so
++                            for (var op in operators) {
++                                if (operators[op].name === operatorNames[selectedIndex]) {
++                                    operators[op].registerOperator();
++                                    return;
++                                }
++                            }
++                            // just asserting to verify the logic
++                            // remove once proven functional
++                            throw "should not be reached.";
++                        }
++                    }
++                }
++            }
++            ListItem.Standard {
++                text: i18n.tr("APN")
++                progression: true
++                enabled: sim.connMan.powered
++                onClicked: {
++                    pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {sim: sim})
++                }
++            }
+         }
+     }
+ }
 === modified file 'plugins/cellular/PageChooseCarriers.qml'
 --- plugins/cellular/PageChooseCarriers.qml	2014-08-17 14:50:51 +0000
 +++ plugins/cellular/PageChooseCarriers.qml	2014-10-09 14:10:12 +0000
@@ -21,7 +21,6 @@
  import SystemSettings 1.0
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
--import MeeGo.QOfono 0.2
  ItemPage {
      id: root
@@ -47,10 +46,11 @@
              ListItem.SingleValue {
                  objectName: "chooseCarrierSim1"
                  value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
++                enabled: sims[0].netReg.status !== ""
                  progression: true
                  onClicked: {
                      pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
--                        netReg: sims[0].netReg,
++                        sim: sims[0],
                          title: sims[0].title
                      })
+                 }
@@ -63,10 +63,11 @@
              ListItem.SingleValue {
                  objectName: "chooseCarrierSim2"
                  value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
++                enabled: sims[1].netReg.status !== ""
                  progression: true
                  onClicked: {
                      pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
--                        netReg: sims[1].netReg,
++                        sim: sims[1],
                          title: sims[1].title
                      })
+                 }
 === added file 'plugins/cellular/ofonoactivator.cpp'
 --- plugins/cellular/ofonoactivator.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/ofonoactivator.cpp	2014-10-09 14:10:12 +0000
@@ -0,0 +1,132 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * Authors:
++ *    Jussi Pakkanen <jussi.pakkanen@canonical.com>
++ *
++ * 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;
++}
 === added file 'plugins/cellular/ofonoactivator.h'
 --- plugins/cellular/ofonoactivator.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/ofonoactivator.h	2014-10-09 14:10:12 +0000
@@ -0,0 +1,42 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * Authors:
++ *    Jussi Pakkanen <jussi.pakkanen@canonical.com>
++ *
++ * 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	2014-07-23 13:44:31 +0000
 +++ plugins/cellular/plugin.cpp	2014-10-09 14:10:12 +0000
@@ -20,11 +20,13 @@
  #include <QtQml>
  #include <QtQml/QQmlContext>
  #include "hotspotmanager.h"
++#include "ofonoactivator.h"
  void BackendPlugin::registerTypes(const char *uri)
+ {
      Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
      qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
++    qmlRegisterType<OfonoActivator>(uri, 1, 0, "OfonoActivator");
+ }
  void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)