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

Reviewer	Review Type	Date Requested	Status
Iain Lane		2014-06-25	Approve on 2014-07-07
PS Jenkins bot	continuous-integration		Approve on 2014-07-05
Antti Kaijanmäki (community)			Approve on 2014-06-27
Review via email: mp+224399@code.launchpad.net

Revision history for this message

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

#

Revision history for this message

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

#

LGTM.

review: Approve

Revision history for this message

Iain Lane (laney) wrote on 2014-06-27:

#

Ta. Mostly good. Some small-ish comments inline.

I didn't test runtime yet, but it looks like you haven't implemented the design <https://wiki.ubuntu.com/Networking#phone-cellular> fully. In particular the labels and dialogs aren't there. Please give this a pass through to implement the design as best you can. I know dialogs are tricky currently so see what you can do there.

review: Needs Fixing

lp:~unity-api-team/ubuntu-system-settings/hotspot updated on 2014-06-27

746. By Jussi Pakkanen on 2014-06-27: Fixed issues raised in review.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-06-27:

#

> I didn't test runtime yet, but it looks like you haven't implemented the design
> <https://wiki.ubuntu.com/Networking#phone-cellular> fully

We are in the process of discussing the final shape of that with mpt so things may still change. Replies to non-design related issues below.

Revision history for this message

Iain Lane (laney) wrote on 2014-06-27:

#

(Don't know how to respond to inline comments; we've been talking about the 'DbusHelper name')

In all other panels we've used qmlRegisterType() (not singleton) and the naming scheme I outlined. I don't know what the wifi panel does (didn't review this one), but doing it like this would be consistent with the rest of u-s-s.

Revision history for this message

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

#

FAILED: Continuous integration, rev:745
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-api-team/ubuntu-system-settings/hotspot/+merge/224399/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:746
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-api-team/ubuntu-system-settings/hotspot/+merge/224399/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-06-30:

#

I made it into a singleton as there is only one NM instance ever so it seemed like the natural thing to do.

Revision history for this message

Iain Lane (laney) wrote on 2014-07-01:

#

I want you to change that but I won't insist on it. I understand the logic and I think that it's possible to argue for either approach. What tips the balance for me is mainly consistency with the rest of u-s-s.

Please rename "DbusHelper" to something that describes what the module is doing though. The fact that it uses D-Bus in the background is an implementation detail that shouldn't be exposed to users of the API.

(Optional) I think it would be nicer API if the get* and is* methods were instead properties.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

#

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

review: Approve (continuous-integration)

Revision history for this message

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

#

> Please rename "DbusHelper" to something that describes what the module is
> doing though. The fact that it uses D-Bus in the background is an
> implementation detail that shouldn't be exposed to users of the API.

Just out of academic curiosity, does this matter that much as it's private API anyway?
All these modules are installed under
/usr/lib/<arch>/ubuntu-system-settings/private/
and are not available to 3rd party applications.

lp:~unity-api-team/ubuntu-system-settings/hotspot updated on 2014-07-01

747. By Jussi Pakkanen on 2014-07-01: DBusHelper is no longer a singleton.
748. By Jussi Pakkanen on 2014-07-01: Renamed hotspot helper class.

Revision history for this message

Iain Lane (laney) wrote on 2014-07-01:

#

On Tue, Jul 01, 2014 at 10:33:04AM -0000, Antti Kaijanmäki wrote:
> > Please rename "DbusHelper" to something that describes what the module is
> > doing though. The fact that it uses D-Bus in the background is an
> > implementation detail that shouldn't be exposed to users of the API.
>
> Just out of academic curiosity, does this matter that much as it's private API anyway?
> All these modules are installed under
> /usr/lib/<arch>/ubuntu-system-settings/private/
> and are not available to 3rd party applications.

We have cases within system-settings itself where API from one panel is
used in another, and the wizard does this too.

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

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-01:

#

Made the class a non-singleton and renamed it as requested.

Originally I wanted to have the given methods as properties but decided against it. I don't remember the exact reason, but it made some implementation bits difficult (or at least did at the time).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

#

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

review: Approve (continuous-integration)

Revision history for this message

Iain Lane (laney) wrote on 2014-07-01:

#

Thanks. I'm not sure what issues you're referring to but no worries.

Please make sure to get the design updated.

I just ran it. Here's the results of that.

The first time I tried it it didn't appear to work at all. I was able to toggle the hotspot on, but the network wasn't visible. On the console I got 'Failed to start adhoc network: "Device not managed by NetworkManager or unavailable". Turned out that this was because I'd disabled wifi from the indicator previously. After enabling that I was able to see the network in nm-applet, but it is greyed out. On the console at this point I see 'WARNING - Error getting connamd: "Method "Get" with signature "ss" on interface "org.freedesktop.DBus.Properties" doesn't exist' (connamd typo).

Also it was unclear to me why the enable toggle was insensitive until I read the code and saw it was waiting for me to enter a passphrase.

If you want to land this right now with these issues I would be happy to do so if we hide the entry item under "visible: showAllUI" so that it's hidden by default but testers can enable it by launching with USS_SHOW_ALL_UI=1. Otherwise I'll want to see some of these issues fixed, or at least someone else with a device confirming that it works for them.

review: Needs Fixing

lp:~unity-api-team/ubuntu-system-settings/hotspot updated on 2014-07-02

749. By Jussi Pakkanen on 2014-07-02: Hide hotspot settings when wifi is disabled.
750. By Jussi Pakkanen on 2014-07-02: Add text to specify that WPA password must be 8 characters or more.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-02:

#

The cellular menu now prevents you from going into the hotspot page when wifi is disabled. Instead it displays some text explaining this. Note that this is NOT YET tested on actual hardware. On the desktop it seems to work, so please verify this with proper packages (once they get built) before approving.

I also added an explanatory text on the hotspot dialog that says that the password must be >= 8 characters long.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-02:

#

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

review: Approve (continuous-integration)

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-02:

#

There seems to be two issues:

1. you need to unjoin all other networks before creating a hotspot
2. the hotspot network comes up but trying to join it with a laptop fails

I have no idea what is causing #2. NM reports that everything is fine and the hotspot is started. Could this be a NM/driver problem?

Revision history for this message

Iain Lane (laney) wrote on 2014-07-02:

#

> There seems to be two issues:
>
> 1. you need to unjoin all other networks before creating a hotspot

Could you do this? Put some text in saying that's what will happen and then disconnect. Will need to restore the state on disabling.

Related question: what happens to the ad-hoc network if you restart the phone?

> 2. the hotspot network comes up but trying to join it with a laptop fails
>
> I have no idea what is causing #2. NM reports that everything is fine and the
> hotspot is started. Could this be a NM/driver problem?

I suggest you ask cyphermox for help here.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-02:

#

I can do #1 but the question is whether we should merge what we have currently and fix this later. This is not a huge amount of work but there has been pressure to get this functionality merged in sooner rather than later. I'll let you make the call on that one.

Interestingly on the desktop creating a hotspot automatically disconnects you from a wifi connection. So maybe the reason #2 is happening is the same as for #1?

Revision history for this message

Iain Lane (laney) wrote on 2014-07-02:

#

I'm betting people will try this straight away and then we'll be hit with bug reports.

Do you want to poke at #2 for a bit? It sounds rather showstoppery to me - do you agree?

lp:~unity-api-team/ubuntu-system-settings/hotspot updated on 2014-07-03

751. By Jussi Pakkanen on 2014-07-03: Added margins.
752. By Jussi Pakkanen on 2014-07-03: Pregenerate a password.
753. By Jussi Pakkanen on 2014-07-03: Use enabled instead of readonly to work around toolkit issue.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-03:

#

Changed the code to create a random password for user convenience.

Also, when trying to enable hotspot on the device, this gets printed to syslog:

Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.498335] wlan: [1343:E :PE ] limMlmAddBss: 1672: TRYING TO HIDE SSID 0
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.498701] wlan: [1343:E :PE ] mlm_add_sta: 1573: GF: 0, ChnlWidth: 0, MimoPS: 0, lsigTXOP: 0, dsssCCK: 0, SGI20: 0, SGI400
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.513382] wlan: [1343:F :PE ] limProcessIbssMlmAddBssRsp: 2524: could not activate Heartbeat timer
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.513748] VOS ASSERT in logDebug Line 219
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.513931] ------------[ cut here ]------------
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.513962] WARNING: at /build/buildd/linux-mako-3.4.0/drivers/staging/prima/CORE/SYS/legacy/src/utils/src/logApi.c:219 logDebug+0xc0/0xf4()
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.513992] Modules linked in:
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514023] [<c00150d0>] (unwind_backtrace+0x0/0xe8) from [<c08cbf68>] (dump_stack+0x20/0x24)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514053] [<c08cbf68>] (dump_stack+0x20/0x24) from [<c0075628>] (warn_slowpath_common+0x5c/0x74)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514114] [<c0075628>] (warn_slowpath_common+0x5c/0x74) from [<c00756fc>] (warn_slowpath_null+0x2c/0x34)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514145] [<c00756fc>] (warn_slowpath_null+0x2c/0x34) from [<c069aad4>] (logDebug+0xc0/0xf4)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514175] [<c069aad4>] (logDebug+0xc0/0xf4) from [<c05e06cc>] (limLog+0x48/0x50)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514236] [<c05e06cc>] (limLog+0x48/0x50) from [<c05fdce8>] (limProcessMlmAddBssRsp+0x168/0xd40)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514267] [<c05fdce8>] (limProcessMlmAddBssRsp+0x168/0xd40) from [<c05f5010>] (limProcessMessages+0xe74/0x10ac)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514297] [<c05f5010>] (limProcessMessages+0xe74/0x10ac) from [<c05f5560>] (limMessageProcessor+0x274/0x2bc)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514328] [<c05f5560>] (limMessageProcessor+0x274/0x2bc) from [<c05db1a8>] (peProcessMessages+0x54/0x5c)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514358] [<c05db1a8>] (peProcessMessages+0x54/0x5c) from [<c06ba540>] (VosMCThread+0x44c/0x68c)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514419] [<c06ba540>] (VosMCThread+0x44c/0x68c) from [<c0095954>] (kthread+0x9c/0xa8)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514450] [<c0095954>] (kthread+0x9c/0xa8) from [<c000ee74>] (kernel_thread_exit+0x0/0x8)
Jul 3 12:42:18 ubuntu-phablet kernel: [ 6023.514480] ---[ end trace 166bc5cdcf3371f7 ]---
Jul 3 12:42:28 ubuntu-phablet kernel: [ 6033.381839] healthd: battery l=84 v=4182 t=23.2 h=2 st=2 c=-180 chg=u

Changed the code to create a random password for user convenience.

Also, when trying to enable hotspot on the device, this gets printed to syslog:

Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.498335] wlan: [1343:E :PE ] limMlmAddBss: 1672: TRYING TO HIDE SSID 0
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.498701] wlan: [1343:E :PE ] mlm_add_sta: 1573: GF: 0, ChnlWidth: 0, MimoPS: 0, lsigTXOP: 0, dsssCCK: 0, SGI20: 0, SGI400
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.513382] wlan: [1343:F :PE ] limProcessIbssMlmAddBssRsp: 2524: could not activate Heartbeat timer
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.513748] VOS ASSERT in logDebug Line 219
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.513931] ------------[ cut here ]------------
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.513962] WARNING: at /build/buildd/linux-mako-3.4.0/drivers/staging/prima/CORE/SYS/legacy/src/utils/src/logApi.c:219 logDebug+0xc0/0xf4()
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.513992] Modules linked in:
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514023] [<c00150d0>] (unwind_backtrace+0x0/0xe8) from [<c08cbf68>] (dump_stack+0x20/0x24)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514053] [<c08cbf68>] (dump_stack+0x20/0x24) from [<c0075628>] (warn_slowpath_common+0x5c/0x74)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514114] [<c0075628>] (warn_slowpath_common+0x5c/0x74) from [<c00756fc>] (warn_slowpath_null+0x2c/0x34)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514145] [<c00756fc>] (warn_slowpath_null+0x2c/0x34) from [<c069aad4>] (logDebug+0xc0/0xf4)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514175] [<c069aad4>] (logDebug+0xc0/0xf4) from [<c05e06cc>] (limLog+0x48/0x50)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514236] [<c05e06cc>] (limLog+0x48/0x50) from [<c05fdce8>] (limProcessMlmAddBssRsp+0x168/0xd40)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514267] [<c05fdce8>] (limProcessMlmAddBssRsp+0x168/0xd40) from [<c05f5010>] (limProcessMessages+0xe74/0x10ac)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514297] [<c05f5010>] (limProcessMessages+0xe74/0x10ac) from [<c05f5560>] (limMessageProcessor+0x274/0x2bc)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514328] [<c05f5560>] (limMessageProcessor+0x274/0x2bc) from [<c05db1a8>] (peProcessMessages+0x54/0x5c)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514358] [<c05db1a8>] (peProcessMessages+0x54/0x5c) from [<c06ba540>] (VosMCThread+0x44c/0x68c)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514419] [<c06ba540>] (VosMCThread+0x44c/0x68c) from [<c0095954>] (kthread+0x9c/0xa8)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514450] [<c0095954>] (kthread+0x9c/0xa8) from [<c000ee74>] (kernel_thread_exit+0x0/0x8)
Jul  3 12:42:18 ubuntu-phablet kernel: [ 6023.514480] ---[ end trace 166bc5cdcf3371f7 ]---
Jul  3 12:42:28 ubuntu-phablet kernel: [ 6033.381839] healthd: battery l=84 v=4182 t=23.2 h=2 st=2 c=-180 chg=u

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

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

#

N4 seems to have a kernel driver issue. The driver is reporting it supports ad-hoc network mode, but clearly the device fails to create one.

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

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

#

Filed a bug about the issue on mako:
https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/1337753

lp:~unity-api-team/ubuntu-system-settings/hotspot updated on 2014-07-04

754. By Jussi Pakkanen on 2014-07-04: Made layout match design (more).
755. By Jussi Pakkanen on 2014-07-04: Hide hotspot settings because it does not work on N4.

Revision history for this message

Jussi Pakkanen (jpakkane) wrote on 2014-07-04:

#

After some discussions it was decided that we hide the hotspot settings as discussed above so people don't try to use it on devices that have a broken wifi driver (e.g. N4).

The widget layout has also been reworked so it now matches the design spec.

This should now be ready for merging finally.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-05:

#

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

review: Approve (continuous-integration)

Revision history for this message

Iain Lane (laney) wrote on 2014-07-07:

#

Okay. There's going to be some design work required before this could be enabled for everyone, the ad-hoc bug notwithstanding. But if it's hidden then fine by me.

Cheers.

review: Approve

ubuntu-system-settings

Merge lp:~unity-api-team/ubuntu-system-settings/hotspot 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-06-18 17:37:07 +0000
 +++ plugins/cellular/CMakeLists.txt	2014-07-04 12:59:29 +0000
@@ -3,14 +3,26 @@
  set(QML_SOURCES
      ChooseCarrier.qml
++    Hotspot.qml
++    HotspotSetup.qml
      PageComponent.qml
+ )
--# We need a dummy target so the QML files show up in Qt Creator
--# If this plugin gets some C++ sources, remove this.
--add_custom_target(cellular-holder
--COMMAND echo This is just a dummy.
--SOURCES ${QML_SOURCES})
--
++
++add_library(UbuntuCellularPanel MODULE
++  plugin.cpp
++  plugin.h
++  hotspotmanager.cpp
++  hotspotmanager.h
++  nm_manager_proxy.h
++  nm_settings_proxy.h
++  nm_settings_connection_proxy.h
++  ${QML_SOURCES}
++)
++qt5_use_modules(UbuntuCellularPanel Qml Quick DBus)
++
++set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Cellular)
++install(TARGETS UbuntuCellularPanel DESTINATION ${PLUG_DIR})
++install(FILES qmldir DESTINATION ${PLUG_DIR})
  install(FILES ${QML_SOURCES} DESTINATION ${PLUGIN_QML_DIR}/cellular)
  install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
 === added file 'plugins/cellular/Hotspot.qml'
 --- plugins/cellular/Hotspot.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/Hotspot.qml	2014-07-04 12:59:29 +0000
@@ -0,0 +1,76 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import SystemSettings 1.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++import Ubuntu.SystemSettings.Cellular 1.0
++
++ItemPage {
++
++    id: hotspot
++
++    title: i18n.tr("Wi-Fi hotspot")
++
++    HotspotManager {
++        id: hotspotManager
++    }
++
++    Column {
++
++        anchors.fill: parent
++
++        ListItem.Standard {
++            text: i18n.tr("Hotspot")
++            control: Switch {
++                id: hotspotSwitch
++                checked: hotspotManager.isHotspotActive()
++                onTriggered: {
++                    if(checked) {
++                        hotspotManager.enableHotspot()
++                    } else {
++                        hotspotManager.disableHotspot()
++                    }
++                }
++            }
++        }
++
++        Label {
++            width: parent.width
++            wrapMode: Text.WordWrap
++            anchors.leftMargin: units.gu(2)
++            anchors.rightMargin: units.gu(2)
++            text : hotspotSwitch.enabled ?
++              i18n.tr("When hotspot is on, other devices can user your cellular data connection over Wi-Fi. Normal data charges apply.")
++              : i18n.tr("Other devices can user your cellular data connection over the Wi-Fi network. Normal data charges apply.")
++        }
++
++        Button {
++            text: i18n.tr("Set up hotspot")
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.leftMargin: units.gu(2)
++            anchors.rightMargin: units.gu(2)
++            onClicked: {
++                pageStack.push(Qt.resolvedUrl("HotspotSetup.qml"), {hotspotManager: hotspotManager})
++            }
++        }
++
++    }
++}
 === added file 'plugins/cellular/HotspotSetup.qml'
 --- plugins/cellular/HotspotSetup.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/HotspotSetup.qml	2014-07-04 12:59:29 +0000
@@ -0,0 +1,103 @@
++/*
++ * This file is part of system-settings
++ *
++ * Copyright (C) 2014 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
++ * PURPOSE.  See the GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License along
++ * with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import QtQuick.Layouts 1.1
++import SystemSettings 1.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++import Ubuntu.SystemSettings.Cellular 1.0
++
++ItemPage {
++
++    id: hotspotSetup
++    title: i18n.tr("Change hotspot setup")
++
++    property var hotspotManager: null
++
++
++    Column {
++
++        anchors.fill: parent
++
++        ListItem.Standard {
++            id: ssidLabel
++            text: i18n.tr("Hotspot name")
++        }
++
++        TextField {
++            id: ssidField
++            text: hotspotManager.getHotspotName()
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.leftMargin: units.gu(2)
++            anchors.rightMargin: units.gu(2)
++        }
++
++        ListItem.Standard {
++            id: passwordLabel
++            text: i18n.tr("Key (must be 8 characters or longer)")
++        }
++
++        TextField {
++            id: passwordField
++            text: hotspotManager.getHotspotPassword()
++            echoMode: passwordVisibleSwitch.checked ? TextInput.Normal : TextInput.Password
++            anchors.left: parent.left
++            anchors.right: parent.right
++            anchors.leftMargin: units.gu(2)
++            anchors.rightMargin: units.gu(2)
++        }
++
++        ListItem.Standard {
++            text: i18n.tr("Show key")
++            id: passwordVisible
++            control: Switch {
++                id: passwordVisibleSwitch
++            }
++        }
++
++        RowLayout {
++            anchors {
++                left: parent.left
++                right: parent.right
++                margins: units.gu(2)
++            }
++
++        Button {
++            id: cancelButton
++            Layout.fillWidth: true
++            text: i18n.tr("Cancel")
++            onClicked: {
++                pageStack.pop()
++            }
++        }
++
++        Button {
++            id: connectButton
++            Layout.fillWidth: true
++            text: i18n.tr("Change")
++            enabled: ssidField.text != "" && passwordField.length >= 8
++            onClicked: {
++                hotspotManager.setupHotspot(ssidField.text, passwordField.text)
++                pageStack.pop()
++            }
++        }
++        }
++    }
++}
 === modified file 'plugins/cellular/PageComponent.qml'
 --- plugins/cellular/PageComponent.qml	2014-06-18 17:37:07 +0000
 +++ plugins/cellular/PageComponent.qml	2014-07-04 12:59:29 +0000
@@ -23,11 +23,25 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.SystemSettings.Phone 1.0
++import QMenuModel 0.1
  ItemPage {
      title: i18n.tr("Cellular")
      objectName: "cellularPage"
++    QDBusActionGroup {
++        id: actionGroup
++        busType: 1
++        busName: "com.canonical.indicator.network"
++        objectPath: "/com/canonical/indicator/network"
++
++        property variant actionObject: action("wifi.enable")
++
++        Component.onCompleted: {
++            start()
++        }
++    }
++
      NetworkRegistration {
          id: netReg
          onModeChanged: {
@@ -107,6 +121,21 @@
+             }
+         }
++        ListItem.SingleValue {
++            text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
++            visible: showAllUI && !hotspotItem.visible
++        }
++
++        ListItem.SingleValue {
++            id: hotspotItem
++            text: i18n.tr("Wi-Fi hotspot")
++            progression: true
++            onClicked: {
++                pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
++            }
++            visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
++        }
++
          ListItem.Standard {
              text: i18n.tr("Data usage statistics")
              progression: true
 === added file 'plugins/cellular/hotspotmanager.cpp'
 --- plugins/cellular/hotspotmanager.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/hotspotmanager.cpp	2014-07-04 12:59:29 +0000
@@ -0,0 +1,248 @@
++/*
++ * 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 "nm_manager_proxy.h"
++#include "nm_settings_proxy.h"
++#include "nm_settings_connection_proxy.h"
++#include "hotspotmanager.h"
++#include <QStringList>
++#include <QDBusReply>
++#include <QtDebug>
++#include <QDBusInterface>
++#include <QDBusMetaType>
++
++typedef QMap<QString, QVariantMap> nmConnectionArg;
++Q_DECLARE_METATYPE(nmConnectionArg)
++
++namespace {
++
++const QString nm_service("org.freedesktop.NetworkManager");
++const QString nm_settings_object("/org/freedesktop/NetworkManager/Settings");
++const QString nm_settings_interface("org.freedesktop.NetworkManager.Settings");
++const QString nm_connection_interface("org.freedesktop.NetworkManager.Settings.Connection");
++const QString nm_dbus_path("/org/freedesktop/NetworkManager");
++const QString nm_device_interface("org.freedesktop.NetworkManager.Device");
++
++#define NM_METHOD_NAME "AddAndActivateConnection"
++
++void startAdhoc(const QByteArray &ssid, const QString &password, const QDBusObjectPath &devicePath) {
++    nmConnectionArg connection;
++
++    QDBusObjectPath specific("/");
++
++    QVariantMap wireless;
++    wireless[QStringLiteral("security")] = QVariant(QStringLiteral("802-11-wireless-security"));
++    wireless[QStringLiteral("ssid")] = QVariant(ssid);
++    wireless[QStringLiteral("mode")] = QVariant(QStringLiteral("adhoc"));
++    connection["802-11-wireless"] = wireless;
++
++    QVariantMap connsettings;
++    connsettings[QStringLiteral("autoconnect")] = QVariant(false);
++    connsettings[QStringLiteral("uuid")] = QVariant(QStringLiteral("aab22b5d-7342-48dc-8920-1b7da31d6829"));
++    connsettings[QStringLiteral("type")] = QVariant(QStringLiteral("802-11-wireless"));
++    connection["connection"] = connsettings;
++
++    QVariantMap ipv4;
++    ipv4[QStringLiteral("addressess")] = QVariant(QStringList());
++    ipv4[QStringLiteral("dns")] = QVariant(QStringList());
++    ipv4[QStringLiteral("method")] = QVariant(QStringLiteral("shared"));
++    ipv4[QStringLiteral("routes")] = QVariant(QStringList());
++    connection["ipv4"] = ipv4;
++
++    QVariantMap security;
++    security[QStringLiteral("proto")] = QVariant(QStringList{"rsn"});
++    security[QStringLiteral("pairwise")] = QVariant(QStringList{"ccmp"});
++    security[QStringLiteral("group")] = QVariant(QStringList{"ccmp"});
++    security[QStringLiteral("key-mgmt")] = QVariant(QStringLiteral("wpa-psk"));
++    security[QStringLiteral("psk")] = QVariant(password);
++    connection["802-11-wireless-security"] = security;
++
++    OrgFreedesktopNetworkManagerInterface mgr(nm_service,
++            nm_dbus_path,
++            QDBusConnection::systemBus());
++    auto reply = mgr.AddAndActivateConnection(connection, devicePath, specific);
++    reply.waitForFinished();
++    if(!reply.isValid()) {
++        qWarning() << "Failed to start adhoc network: " << reply.error().message() << "\n";
++    }
++}
++
++bool detectAdhoc(QString &dbusPath, QByteArray &ssid, QString &password, bool &isActive) {
++    static const QString activeIface("org.freedesktop.NetworkManager.Connection.Active");
++    static const QString connProp("Connection");
++    OrgFreedesktopNetworkManagerInterface mgr(nm_service,
++            nm_dbus_path,
++            QDBusConnection::systemBus());
++    auto activeConnections = mgr.activeConnections();
++    OrgFreedesktopNetworkManagerSettingsInterface settings(nm_service, nm_settings_object,
++            QDBusConnection::systemBus());
++    QSet<QDBusObjectPath> actives;
++    auto r = settings.ListConnections();
++    r.waitForFinished();
++    for(const auto &conn : activeConnections) {
++        QDBusInterface iface(nm_service, conn.path(), "org.freedesktop.DBus.Properties",
++                QDBusConnection::systemBus());
++        QDBusReply<QVariant> conname = iface.call("Get", activeIface, connProp);
++        if(!conname.isValid()) {
++            qWarning() << "Error getting connamd: " << conname.error().message() << "\n";
++            continue;
++        }
++        QDBusObjectPath mainConnection = qvariant_cast<QDBusObjectPath>(conname.value());
++        actives.insert(mainConnection);
++    }
++    const char wifiKey[] = "802-11-wireless";
++    for(const auto &i : r.value()) {
++        OrgFreedesktopNetworkManagerSettingsConnectionInterface conn(nm_service,
++                i.path(),
++                QDBusConnection::systemBus());
++        auto reply = conn.GetSettings();
++        reply.waitForFinished();
++        auto s = reply.value();
++        if(s.find(wifiKey) != s.end()) {
++            auto wsetup = s[wifiKey];
++            if(wsetup["mode"] == "adhoc") {
++                dbusPath = i.path();
++                ssid = wsetup["ssid"].toByteArray();
++                auto pwdReply = conn.GetSecrets("802-11-wireless-security");
++                pwdReply.waitForFinished();
++                password = pwdReply.value()["802-11-wireless-security"]["psk"].toString();
++                isActive = false;
++                for(const auto &ac : actives) {
++                    if(i == ac) {
++                        isActive = true;
++                        break;
++                    }
++                }
++                return true;
++            }
++        }
++    }
++    return false;
++}
++
++QDBusObjectPath detectWirelessDevice() {
++    OrgFreedesktopNetworkManagerInterface mgr(nm_service,
++            nm_dbus_path,
++            QDBusConnection::systemBus());
++    auto devices = mgr.GetDevices();
++    devices.waitForFinished();
++    for(const auto &dpath : devices.value()) {
++        QDBusInterface iface(nm_service, dpath.path(), "org.freedesktop.DBus.Properties",
++                QDBusConnection::systemBus());
++        QDBusReply<QVariant> typeReply = iface.call("Get", "org.freedesktop.NetworkManager.Device", "DeviceType");
++        auto typeInt = qvariant_cast<int>(typeReply.value());
++        if(typeInt == 2) {
++            return dpath; // Assumptions are that there is only one wifi device and it is not hotpluggable.
++        }
++    }
++    qWarning() << "Wireless device not found, hotspot functionality is inoperative.\n";
++    return QDBusObjectPath();
++}
++
++std::string generate_password() {
++    static const std::string items("abcdefghijklmnopqrstuvwxyz01234567890");
++    const int passwordLength = 8;
++    std::string result;
++    for(int i=0; i<passwordLength; i++) {
++        result.push_back(items[std::rand() % items.length()]);
++    }
++    return result;
++}
++
++}
++
++HotspotManager::HotspotManager(QObject *parent) : QObject(parent),
++        m_devicePath(detectWirelessDevice()) {
++    static bool isRegistered = false;
++    if(!isRegistered) {
++        qDBusRegisterMetaType<nmConnectionArg>();
++        isRegistered = true;
++    }
++    if(!detectAdhoc(m_settingsPath, m_ssid, m_password, m_isActive)) {
++        m_settingsPath = "";
++        m_ssid = "Ubuntu hotspot";
++        m_password = generate_password().c_str();
++        m_isActive = false;
++    }
++}
++
++QByteArray HotspotManager::getHotspotName() {
++    return m_ssid;
++}
++
++QString HotspotManager::getHotspotPassword() {
++    return m_password;
++}
++
++void HotspotManager::setupHotspot(QByteArray ssid_, QString password_) {
++    m_ssid = ssid_;
++    m_password = password_;
++}
++
++void HotspotManager::enableHotspot() {
++    if(!m_settingsPath.isEmpty()) {
++        // Prints a warning message if the connection has disappeared already.
++        destroyHotspot();
++        // NM returns from the dbus call immediately but only destroys the
++        // connection some time later. There is no callback for when this happens.
++        // So this is the best we can do with reasonable effort.
++        QThread::sleep(1);
++    }
++    startAdhoc(m_ssid, m_password, m_devicePath);
++    detectAdhoc(m_settingsPath, m_ssid, m_password, m_isActive);
++}
++
++bool HotspotManager::isHotspotActive() {
++    return m_isActive;
++}
++
++void HotspotManager::disableHotspot() {
++    static const QString activeIface("org.freedesktop.NetworkManager.Connection.Active");
++    static const QString connProp("Connection");
++    OrgFreedesktopNetworkManagerInterface mgr(nm_service,
++            nm_dbus_path,
++            QDBusConnection::systemBus());
++    auto activeConnections = mgr.activeConnections();
++    for(const auto &aConn : activeConnections) {
++        QDBusInterface iface(nm_service, aConn.path(), "org.freedesktop.DBus.Properties",
++                QDBusConnection::systemBus());
++        QDBusReply<QVariant> conname = iface.call("Get", activeIface, connProp);
++        QDBusObjectPath backingConnection = qvariant_cast<QDBusObjectPath>(conname.value());
++        if(backingConnection.path() == m_settingsPath) {
++            mgr.DeactivateConnection(aConn);
++            return;
++        }
++    }
++    qWarning() << "Could not find a hotspot setup to disable.\n";
++}
++
++void HotspotManager::destroyHotspot() {
++    if(m_settingsPath.isEmpty()) {
++        qWarning() << "Tried to destroy nonexisting hotspot.\n";
++        return;
++    }
++    QDBusInterface control(nm_service, m_settingsPath, nm_connection_interface,
++            QDBusConnection::systemBus());
++    QDBusReply<void> reply = control.call("Delete");
++    if(!reply.isValid()) {
++        qWarning() << "Could not disconnect adhoc network: " << reply.error().message() << "\n";
++    } else {
++        m_isActive = false;
++    }
++}
 === added file 'plugins/cellular/hotspotmanager.h'
 --- plugins/cellular/hotspotmanager.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/hotspotmanager.h	2014-07-04 12:59:29 +0000
@@ -0,0 +1,53 @@
++/*
++ * 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 CELLULAR_DBUS_HELPER
++#define CELLULAR_DBUS_HELPER
++
++#include <QObject>
++#include <QDBusObjectPath>
++/**
++ * For exposing dbus data to Qml.
++ */
++
++class HotspotManager : public QObject {
++    Q_OBJECT
++
++public:
++    HotspotManager(QObject *parent = nullptr);
++    ~HotspotManager() {};
++
++    Q_INVOKABLE QByteArray getHotspotName();
++    Q_INVOKABLE QString getHotspotPassword();
++    Q_INVOKABLE void setupHotspot(QByteArray ssid, QString password);
++    Q_INVOKABLE bool isHotspotActive();
++    Q_INVOKABLE void enableHotspot();
++    Q_INVOKABLE void disableHotspot();
++    void destroyHotspot();
++
++private:
++    QByteArray m_ssid;
++    QString m_password;
++    QString m_settingsPath;
++    QDBusObjectPath m_devicePath;
++    bool m_isActive;
++};
++
++
++#endif
 === added file 'plugins/cellular/nm_manager_proxy.h'
 --- plugins/cellular/nm_manager_proxy.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/nm_manager_proxy.h	2014-07-04 12:59:29 +0000
@@ -0,0 +1,207 @@
++/*
++ * This file was generated by qdbusxml2cpp version 0.8
++ * Command line was: qdbusxml2cpp -N -p nm_manager_proxy.h -v nm-manager-introspection.xml
++ *
++ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++ *
++ * This is an auto-generated file.
++ * Do not edit! All changes made to it will be lost.
++ */
++
++#ifndef NM_MANAGER_PROXY_H_1403027877
++#define NM_MANAGER_PROXY_H_1403027877
++
++#include <QtCore/QObject>
++#include <QtCore/QByteArray>
++#include <QtCore/QList>
++#include <QtCore/QMap>
++#include <QtCore/QString>
++#include <QtCore/QStringList>
++#include <QtCore/QVariant>
++#include <QtDBus/QtDBus>
++
++/*
++ * Proxy class for interface org.freedesktop.NetworkManager
++ */
++class OrgFreedesktopNetworkManagerInterface: public QDBusAbstractInterface
++{
++    Q_OBJECT
++public:
++    static inline const char *staticInterfaceName()
++    { return "org.freedesktop.NetworkManager"; }
++
++public:
++    OrgFreedesktopNetworkManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0)
++        : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
++    {}
++
++    ~OrgFreedesktopNetworkManagerInterface()
++    {}
++
++    Q_PROPERTY(QDBusObjectPath ActivatingConnection READ activatingConnection)
++    inline QDBusObjectPath activatingConnection() const
++    { return qvariant_cast< QDBusObjectPath >(property("ActivatingConnection")); }
++
++    Q_PROPERTY(QList<QDBusObjectPath> ActiveConnections READ activeConnections)
++    inline QList<QDBusObjectPath> activeConnections() const
++    { return qvariant_cast< QList<QDBusObjectPath> >(property("ActiveConnections")); }
++
++    Q_PROPERTY(uint Connectivity READ connectivity)
++    inline uint connectivity() const
++    { return qvariant_cast< uint >(property("Connectivity")); }
++
++    Q_PROPERTY(bool NetworkingEnabled READ networkingEnabled)
++    inline bool networkingEnabled() const
++    { return qvariant_cast< bool >(property("NetworkingEnabled")); }
++
++    Q_PROPERTY(QDBusObjectPath PrimaryConnection READ primaryConnection)
++    inline QDBusObjectPath primaryConnection() const
++    { return qvariant_cast< QDBusObjectPath >(property("PrimaryConnection")); }
++
++    Q_PROPERTY(uint State READ state)
++    inline uint state() const
++    { return qvariant_cast< uint >(property("State")); }
++
++    Q_PROPERTY(QString Version READ version)
++    inline QString version() const
++    { return qvariant_cast< QString >(property("Version")); }
++
++    Q_PROPERTY(bool WimaxEnabled READ wimaxEnabled WRITE setWimaxEnabled)
++    inline bool wimaxEnabled() const
++    { return qvariant_cast< bool >(property("WimaxEnabled")); }
++    inline void setWimaxEnabled(bool value)
++    { setProperty("WimaxEnabled", QVariant::fromValue(value)); }
++
++    Q_PROPERTY(bool WimaxHardwareEnabled READ wimaxHardwareEnabled)
++    inline bool wimaxHardwareEnabled() const
++    { return qvariant_cast< bool >(property("WimaxHardwareEnabled")); }
++
++    Q_PROPERTY(bool WirelessEnabled READ wirelessEnabled WRITE setWirelessEnabled)
++    inline bool wirelessEnabled() const
++    { return qvariant_cast< bool >(property("WirelessEnabled")); }
++    inline void setWirelessEnabled(bool value)
++    { setProperty("WirelessEnabled", QVariant::fromValue(value)); }
++
++    Q_PROPERTY(bool WirelessHardwareEnabled READ wirelessHardwareEnabled)
++    inline bool wirelessHardwareEnabled() const
++    { return qvariant_cast< bool >(property("WirelessHardwareEnabled")); }
++
++    Q_PROPERTY(bool WwanEnabled READ wwanEnabled WRITE setWwanEnabled)
++    inline bool wwanEnabled() const
++    { return qvariant_cast< bool >(property("WwanEnabled")); }
++    inline void setWwanEnabled(bool value)
++    { setProperty("WwanEnabled", QVariant::fromValue(value)); }
++
++    Q_PROPERTY(bool WwanHardwareEnabled READ wwanHardwareEnabled)
++    inline bool wwanHardwareEnabled() const
++    { return qvariant_cast< bool >(property("WwanHardwareEnabled")); }
++
++public Q_SLOTS: // METHODS
++    inline QDBusPendingReply<QDBusObjectPath> ActivateConnection(const QDBusObjectPath &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
++        return asyncCallWithArgumentList(QLatin1String("ActivateConnection"), argumentList);
++    }
++
++    inline QDBusPendingReply<QDBusObjectPath, QDBusObjectPath> AddAndActivateConnection(const QMap<QString, QVariantMap> &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
++        return asyncCallWithArgumentList(QLatin1String("AddAndActivateConnection"), argumentList);
++    }
++    inline QDBusReply<QDBusObjectPath> AddAndActivateConnection(const QMap<QString, QVariantMap> &connection, const QDBusObjectPath &device, const QDBusObjectPath &specific_object, QDBusObjectPath &active_connection)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(connection) << QVariant::fromValue(device) << QVariant::fromValue(specific_object);
++        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("AddAndActivateConnection"), argumentList);
++        if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
++            active_connection = qdbus_cast<QDBusObjectPath>(reply.arguments().at(1));
++        }
++        return reply;
++    }
++
++    inline QDBusPendingReply<uint> CheckConnectivity()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("CheckConnectivity"), argumentList);
++    }
++
++    inline QDBusPendingReply<> DeactivateConnection(const QDBusObjectPath &active_connection)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(active_connection);
++        return asyncCallWithArgumentList(QLatin1String("DeactivateConnection"), argumentList);
++    }
++
++    inline QDBusPendingReply<> Enable(bool enable)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(enable);
++        return asyncCallWithArgumentList(QLatin1String("Enable"), argumentList);
++    }
++
++    inline QDBusPendingReply<QDBusObjectPath> GetDeviceByIpIface(const QString &iface)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(iface);
++        return asyncCallWithArgumentList(QLatin1String("GetDeviceByIpIface"), argumentList);
++    }
++
++    inline QDBusPendingReply<QList<QDBusObjectPath> > GetDevices()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("GetDevices"), argumentList);
++    }
++
++    inline QDBusPendingReply<QString, QString> GetLogging()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("GetLogging"), argumentList);
++    }
++    inline QDBusReply<QString> GetLogging(QString &domains)
++    {
++        QList<QVariant> argumentList;
++        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("GetLogging"), argumentList);
++        if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
++            domains = qdbus_cast<QString>(reply.arguments().at(1));
++        }
++        return reply;
++    }
++
++    inline QDBusPendingReply<QMap<QString, QString> > GetPermissions()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("GetPermissions"), argumentList);
++    }
++
++    inline QDBusPendingReply<> SetLogging(const QString &level, const QString &domains)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(level) << QVariant::fromValue(domains);
++        return asyncCallWithArgumentList(QLatin1String("SetLogging"), argumentList);
++    }
++
++    inline QDBusPendingReply<> Sleep(bool sleep)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(sleep);
++        return asyncCallWithArgumentList(QLatin1String("Sleep"), argumentList);
++    }
++
++    inline QDBusPendingReply<uint> state()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("state"), argumentList);
++    }
++
++Q_SIGNALS: // SIGNALS
++    void CheckPermissions();
++    void DeviceAdded(const QDBusObjectPath &in0);
++    void DeviceRemoved(const QDBusObjectPath &in0);
++    void PropertiesChanged(const QVariantMap &in0);
++    void StateChanged(uint in0);
++};
++
++#endif
++
 === added file 'plugins/cellular/nm_settings_connection_proxy.h'
 --- plugins/cellular/nm_settings_connection_proxy.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/nm_settings_connection_proxy.h	2014-07-04 12:59:29 +0000
@@ -0,0 +1,74 @@
++/*
++ * This file was generated by qdbusxml2cpp version 0.8
++ * Command line was: qdbusxml2cpp -N -p nm_settings_connection_proxy.h -v nm-settings-connection-introspection.xml
++ *
++ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++ *
++ * This is an auto-generated file.
++ * Do not edit! All changes made to it will be lost.
++ */
++
++#ifndef NM_SETTINGS_CONNECTION_PROXY_H_1402664031
++#define NM_SETTINGS_CONNECTION_PROXY_H_1402664031
++
++#include <QtCore/QObject>
++#include <QtCore/QByteArray>
++#include <QtCore/QList>
++#include <QtCore/QMap>
++#include <QtCore/QString>
++#include <QtCore/QStringList>
++#include <QtCore/QVariant>
++#include <QtDBus/QtDBus>
++
++/*
++ * Proxy class for interface org.freedesktop.NetworkManager.Settings.Connection
++ */
++class OrgFreedesktopNetworkManagerSettingsConnectionInterface: public QDBusAbstractInterface
++{
++    Q_OBJECT
++public:
++    static inline const char *staticInterfaceName()
++    { return "org.freedesktop.NetworkManager.Settings.Connection"; }
++
++public:
++    OrgFreedesktopNetworkManagerSettingsConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0)
++        : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
++    {}
++
++
++    ~OrgFreedesktopNetworkManagerSettingsConnectionInterface()
++    {}
++
++public Q_SLOTS: // METHODS
++    inline QDBusPendingReply<> Delete()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("Delete"), argumentList);
++    }
++
++    inline QDBusPendingReply<QMap<QString, QVariantMap> > GetSecrets(const QString &setting_name)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(setting_name);
++        return asyncCallWithArgumentList(QLatin1String("GetSecrets"), argumentList);
++    }
++
++    inline QDBusPendingReply<QMap<QString, QVariantMap> > GetSettings()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("GetSettings"), argumentList);
++    }
++
++    inline QDBusPendingReply<> Update(const QMap<QString, QVariantMap> &properties)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(properties);
++        return asyncCallWithArgumentList(QLatin1String("Update"), argumentList);
++    }
++
++Q_SIGNALS: // SIGNALS
++    void Removed();
++    void Updated();
++};
++
++#endif
 === added file 'plugins/cellular/nm_settings_proxy.h'
 --- plugins/cellular/nm_settings_proxy.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/nm_settings_proxy.h	2014-07-04 12:59:29 +0000
@@ -0,0 +1,84 @@
++/*
++ * This file was generated by qdbusxml2cpp version 0.8
++ * Command line was: qdbusxml2cpp -N -p nm_settings_proxy.h -v nm-settings-introspection.xml
++ *
++ * qdbusxml2cpp is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
++ *
++ * This is an auto-generated file.
++ * Do not edit! All changes made to it will be lost.
++ */
++
++#ifndef NM_SETTINGS_PROXY_H_1402663916
++#define NM_SETTINGS_PROXY_H_1402663916
++
++#include <QtCore/QObject>
++#include <QtCore/QByteArray>
++#include <QtCore/QList>
++#include <QtCore/QMap>
++#include <QtCore/QString>
++#include <QtCore/QStringList>
++#include <QtCore/QVariant>
++#include <QtDBus/QtDBus>
++
++/*
++ * Proxy class for interface org.freedesktop.NetworkManager.Settings
++ */
++class OrgFreedesktopNetworkManagerSettingsInterface: public QDBusAbstractInterface
++{
++    Q_OBJECT
++public:
++    static inline const char *staticInterfaceName()
++    { return "org.freedesktop.NetworkManager.Settings"; }
++
++public:
++    OrgFreedesktopNetworkManagerSettingsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0)
++        : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
++    {}
++
++    ~OrgFreedesktopNetworkManagerSettingsInterface()
++    {}
++
++    Q_PROPERTY(bool CanModify READ canModify)
++    inline bool canModify() const
++    { return qvariant_cast< bool >(property("CanModify")); }
++
++    Q_PROPERTY(QString Hostname READ hostname)
++    inline QString hostname() const
++    { return qvariant_cast< QString >(property("Hostname")); }
++
++public Q_SLOTS: // METHODS
++    inline QDBusPendingReply<QDBusObjectPath> AddConnection(const QMap<QString, QVariantMap> &connection)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(connection);
++        return asyncCallWithArgumentList(QLatin1String("AddConnection"), argumentList);
++    }
++
++    inline QDBusPendingReply<QDBusObjectPath> GetConnectionByUuid(const QString &uuid)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(uuid);
++        return asyncCallWithArgumentList(QLatin1String("GetConnectionByUuid"), argumentList);
++    }
++
++    inline QDBusPendingReply<QList<QDBusObjectPath> > ListConnections()
++    {
++        QList<QVariant> argumentList;
++        return asyncCallWithArgumentList(QLatin1String("ListConnections"), argumentList);
++    }
++
++    inline QDBusPendingReply<> SaveHostname(const QString &hostname)
++    {
++        QList<QVariant> argumentList;
++        argumentList << QVariant::fromValue(hostname);
++        return asyncCallWithArgumentList(QLatin1String("SaveHostname"), argumentList);
++    }
++
++Q_SIGNALS: // SIGNALS
++    void NewConnection(const QDBusObjectPath &in0);
++    void PropertiesChanged(const QVariantMap &in0);
++};
++
++#endif
++
++
 === added file 'plugins/cellular/plugin.cpp'
 --- plugins/cellular/plugin.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/plugin.cpp	2014-07-04 12:59:29 +0000
@@ -0,0 +1,32 @@
++/*
++ * Copyright (C) 2013 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#include <QtQml>
++#include <QtQml/QQmlContext>
++#include "plugin.h"
++#include "hotspotmanager.h"
++
++void BackendPlugin::registerTypes(const char *uri)
++{
++    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Cellular"));
++    qmlRegisterType<HotspotManager>(uri, 1, 0, "HotspotManager");
++}
++
++void BackendPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
++{
++    QQmlExtensionPlugin::initializeEngine(engine, uri);
++}
 === added file 'plugins/cellular/plugin.h'
 --- plugins/cellular/plugin.h	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/plugin.h	2014-07-04 12:59:29 +0000
@@ -0,0 +1,34 @@
++/*
++ * Copyright (C) 2014 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++*/
++
++#ifndef PLUGIN_H
++#define PLUGIN_H
++
++#include <QtQml/QQmlEngine>
++#include <QtQml/QQmlExtensionPlugin>
++
++class BackendPlugin: public QQmlExtensionPlugin
++{
++    Q_OBJECT
++    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
++
++public:
++    void registerTypes(const char *uri);
++    void initializeEngine(QQmlEngine *engine, const char *uri);
++};
++
++#endif // PLUGIN_H
 === added file 'plugins/cellular/qmldir'
 --- plugins/cellular/qmldir	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/qmldir	2014-07-04 12:59:29 +0000
@@ -0,0 +1,2 @@
++module Ubuntu.SystemSettings.Cellular
++plugin UbuntuCellularPanel