Merge lp:~jonas-drange/ubuntu-system-settings/allow-insecure-hotspot into lp:ubuntu-system-settings

[Jonas G. Drange]

[hotspot] allow insecure hotspot, hide hotspot for mako, make autopilot tests run on mako, and change packaging so we get a newer Connectivity API (provided by indicator-network).

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
Yes
 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Yes
 * Has your component "TestPlan” been executed successfully on emulator, N4?
Yes
 * Has a 5 minute exploratory testing run been executed on N4?
N/A
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
Yes, and Ken VanDine is subscribed.
 * If you changed the UI, did you subscribe the design-reviewers to this MP?
Yes (mpt)
 * What components might get impacted by your changes?
Hotspot
 * Have you requested review by the teams of these owning components?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1515
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2379/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/563
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3220
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3931
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3931/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22965

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1517
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2380/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3971
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/155
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/564
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3248
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3968
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23006

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1518
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2382/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3978
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/566
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3252
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3975
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3975/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23011

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

The latest CI run did have a hotspot related failure:
ubuntu_system_settings.tests.test_hotspot.HotspotSetupTestCase.test_insecure_setup

The other failures look unrelated

[Matthew Paul Thomas (mpt)]

Thanks for this refinement!

review: Needs Fixing

[Jonas G. Drange (jonas-drange)]

> The latest CI run did have a hotspot related failure:
> ubuntu_system_settings.tests.test_hotspot.HotspotSetupTestCase.test_insecure_s
> etup
>
> The other failures look unrelated
Right, we need a newer Connectivity API for insecure setup to work, so this is expected. I'll bump deps to make the CI fail completely.

[Jonas G. Drange (jonas-drange)]

On 3 September 2015 at 13:18, Matthew Paul Thomas <email address hidden> wrote:

> Review: Needs Fixing
>
> ​… ​
> If you check the checkbox, the password field should be focused
> automatically.
>

​Not sure I understand your comment, but I've added a note about this being
a workaround with reference to lp:1415023​

​​

> How is settingsValid() ever true when passwordRequiredSwitch is unchecked?
>

settingsValid tests if 1) ssid is a string (not "") and 2) if the
passwordRequired checkbox is checked, it sees if the password length is >=
8.

Could you file a bug about hexadecimal passwords so we can have a
discussion about it? I want to make sure NetworkManager/wpa_supplicant can
handle it before implementing it. Thanks!

As for the rest, I would love another peek at the updated diff (r1519).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1519
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2383/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4022/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4019/console

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

review: Needs Fixing (continuous-integration)

[lp:~jonas-drange/ubuntu-system-settings/allow-insecure-hotspot]

1520. By Jonas G. Drange on 2015-09-06

create plugin for hotspot

1521. By Jonas G. Drange on 2015-09-08

refactor test classes for re-use, refactor dynamic visibility logic

1522. By Jonas G. Drange on 2015-09-08

remove mako exceptions in setup code now that the plugin is hidden altogether

1523. By Jonas G. Drange on 2015-09-08

remove visibility exception in test objects, prune diff

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1522
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2384/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4066/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/568/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4063/console

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

I, very informally, measured the start up time of System Settings on mako before and after adding the dynamic visibility of the hotspot entry.

Static hotspot visibility, start up time (in seconds):
4.8
4.7
4.7
4.6
4.6
5.1

Dynamic hotspot visibility, start up time (in seconds):
4.8
4.9
5.1
5.1
4.9
4.7

A 0.1 to 0.3 seconds penalty was added.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1523
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4070/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/569/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4067/console

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

See inline comment

review: Needs Fixing

[lp:~jonas-drange/ubuntu-system-settings/allow-insecure-hotspot]

1524. By Jonas G. Drange on 2015-09-08

unnecessary comment

1525. By Jonas G. Drange on 2015-09-08

make mako comment clearer

1526. By Jonas G. Drange on 2015-09-09

remove qstringlist and qdebug include

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1526
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2388/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4086/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/572/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4083/console

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

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

There are 2 places where the strings don't match the design (not necessarily part of this MR, but lets fix it here)

HotSpotSetup.qml
- i18n.tr("Change hotspot setup") : i18n.tr("Setup hotspot")
+ i18n.tr("Change Hotspot Setup") : i18n.tr("Set Up Hotspot")

PageComponent.qml
- i18n.tr("Change password/setup…") : i18n.tr("Set up hotspot…")
+ i18n.tr("Change Password/Setup…") : i18n.tr("Set Up Hotspot…")

review: Needs Fixing

[lp:~jonas-drange/ubuntu-system-settings/allow-insecure-hotspot]

1527. By Jonas G. Drange on 2015-09-10

be consistent in casing and setup vs set up

[Ken VanDine (ken-vandine)]

Thanks, looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1527
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2389/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4105/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/573/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4102/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-08-24 07:50:13 +0000
+++ debian/control	2015-09-10 15:34:03 +0000
@@ -23,7 +23,7 @@
                libunity-api-dev,
                libupower-glib-dev,
                pkg-config,
-               qml-module-ubuntu-connectivity (>= 0.5.3),
+               qml-module-ubuntu-connectivity (>= 0.5.4),
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -71,7 +71,7 @@
          powerd (>= 0.15) | gnome-settings-daemon,
          qmenumodel-qml,
          qml-module-qt-labs-folderlistmodel,
-         qml-module-ubuntu-connectivity (>= 0.5.3),
+         qml-module-ubuntu-connectivity (>= 0.5.4),
          qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
          qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
          qtdeclarative5-ofono0.2 (>=0.70~),
 
=== modified file 'plugins/hotspot/CMakeLists.txt'
--- plugins/hotspot/CMakeLists.txt	2015-08-12 15:06:37 +0000
+++ plugins/hotspot/CMakeLists.txt	2015-09-10 15:34:03 +0000
@@ -1,3 +1,5 @@
+add_subdirectory(plugin)
+
 set(QML_SOURCES
     Common.qml
     HotspotSetup.qml
 
=== modified file 'plugins/hotspot/HotspotSetup.qml'
--- plugins/hotspot/HotspotSetup.qml	2015-08-17 15:35:08 +0000
+++ plugins/hotspot/HotspotSetup.qml	2015-09-10 15:34:03 +0000
@@ -43,11 +43,21 @@
         anchorToKeyboard: true
 
         function settingsValid() {
-            return ssidField.text != "" && passwordField.length >= 8;
+            var ssidValid = ssidField.text !== "";
+            var passwordValid = passwordRequiredToggle.checked ?
+                                passwordField.length >= 8 : true;
+            return ssidValid && passwordValid;
+        }
+
+        function updateHotspotSettings () {
+            Connectivity.hotspotSsid = ssidField.text;
+            Connectivity.hotspotPassword = passwordField.text;
+            Connectivity.hotspotAuth = passwordRequiredToggle.checked ?
+                                       "wpa-psk" : "none";
         }
 
         title: stored ?
-            i18n.tr("Change hotspot setup") : i18n.tr("Setup hotspot")
+            i18n.tr("Change Hotspot Setup") : i18n.tr("Set Up Hotspot")
         text: feedback.enabled ? feedback.text : "";
 
         Common {
@@ -70,7 +80,11 @@
                     enabled: false
                 }
                 PropertyChanges {
-                    target: passwordLabel
+                    target: passwordRequired
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordRequiredLabel
                     opacity: 0.5
                 }
                 PropertyChanges {
@@ -117,14 +131,18 @@
                     opacity: 0.5
                 }
                 PropertyChanges {
+                    target: passwordRequired
+                    enabled: false
+                }
+                PropertyChanges {
+                    target: passwordRequiredLabel
+                    opacity: 0.5
+                }
+                PropertyChanges {
                     target: ssidField
                     enabled: false
                 }
                 PropertyChanges {
-                    target: passwordLabel
-                    opacity: 0.5
-                }
-                PropertyChanges {
                     target: passwordField
                     enabled: false
                 }
@@ -132,10 +150,6 @@
                     target: confirmButton
                     enabled: false
                 }
-                PropertyChanges {
-                    target: enableWifiCaption
-                    visible: false
-                }
             }
         ]
 
@@ -157,8 +171,8 @@
 
             Label {
                 id: ssidLabel
-                text: i18n.tr("Hotspot name")
-                fontSize: "medium"
+                text: hotspotSetupDialog.stored ? i18n.tr("Hotspot name") :
+                                                  i18n.tr("Choose a name")
                 font.bold: true
                 color: Theme.palette.selected.backgroundText
                 elide: Text.ElideRight
@@ -173,43 +187,78 @@
                 width: parent.width
             }
 
-            Label {
-                id: passwordLabel
-                // TRANSLATORS: “Password (optional)” is hidden.
-                text: showAllUI ? i18n.tr("Password (optional)") :
-                                  i18n.tr("Key (must be 8 characters or longer)")
-                fontSize: "medium"
-                font.bold: true
-                color: Theme.palette.selected.backgroundText
-                wrapMode: Text.WordWrap
-                width: parent.width
-            }
-
-            Label {
-                visible: showAllUI
-                // TRANSLATORS: This string is hidden.
-                text: i18n.tr("If you do not enter a password, the hotspot will be insecure.")
+            ListItem.Empty {
+                id: passwordRequired
+                onClicked: passwordRequiredToggle.trigger()
+
+                CheckBox {
+                    id: passwordRequiredToggle
+                    objectName: "passwordRequiredToggle"
+                    checked: Connectivity.hotspotAuth === "wpa-psk"
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                    }
+                    // FIXME: Workaround for lp:1415023
+                    activeFocusOnPress: false
+                }
+
+                Label {
+                    id: passwordRequiredLabel
+                    anchors {
+                        left: passwordRequiredToggle.right
+                        leftMargin: units.gu(1)
+                        right: parent.right
+                        verticalCenter: parent.verticalCenter
+                    }
+
+                    // FIXME: Workaround for label not wrapping (lp:1442851)
+                    wrapMode: Text.Wrap
+                    text: i18n.tr("Require a password (recommended):")
+                }
             }
 
             TextField {
                 id: passwordField
                 objectName: "passwordField"
+                enabled: passwordRequiredToggle.checked
                 text: Connectivity.hotspotPassword
-                echoMode: passwordVisibleSwitch.checked ?
+                echoMode: passwordVisibleToggle.checked ?
                     TextInput.Normal : TextInput.Password
                 inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhNoPredictiveText
                 width: parent.width
             }
 
-            ListItem.Standard {
-                // TRANSLATORS: “Show password” is hidden.
-                text: showAllUI ? i18n.tr("Show password") : i18n.tr("Show key")
+            ListItem.Empty {
                 id: passwordVisible
-                onClicked: passwordVisibleSwitch.trigger()
-                control: Switch {
-                    id: passwordVisibleSwitch
+                enabled: passwordRequiredToggle.checked
+                onClicked: passwordVisibleToggle.trigger()
+
+                CheckBox {
+                    id: passwordVisibleToggle
+                    enabled: parent.enabled
+                    anchors {
+                        left: parent.left
+                        verticalCenter: parent.verticalCenter
+                    }
+
+                    // FIXME: Workaround for lp:1415023
                     activeFocusOnPress: false
                 }
+
+                Label {
+                    id: passwordVisibleLabel
+
+                    /* FIXME: use enabled when lp:1491802 is fixed, or use
+                    CheckBox.text once lp:1323238 is fixed. */
+                    opacity: passwordRequiredToggle.checked ? 1 : 0.5
+                    anchors {
+                        left: passwordVisibleToggle.right
+                        leftMargin: units.gu(1)
+                        verticalCenter: parent.verticalCenter
+                    }
+                    text: i18n.tr("Show password")
+                }
             }
 
             ListItem.Caption {
@@ -218,8 +267,10 @@
                     left: parent.left
                     right: parent.right
                 }
-                text: i18n.tr("In order to create a hotspot, you need to turn Wi-Fi on.")
-                visible: !Connectivity.wifiEnabled && !hotspotSetupDialog.stored
+                text: i18n.tr("Starting the hotspot will turn on Wi-Fi.")
+                visible: !Connectivity.wifiEnabled &&
+                         !hotspotSetupDialog.stored &&
+                         hotspotSetupDialog.state !== "SUCCEEDED"
             }
 
             Row {
@@ -235,6 +286,8 @@
                     id: cancelButton
                     width: (parent.width / 2) - units.gu(1)
                     text: i18n.tr("Cancel")
+
+                    // FIXME: Workaround for lp:1415023
                     activeFocusOnPress: false
                     onClicked: PopupUtils.close(hotspotSetupDialog)
                 }
@@ -246,6 +299,8 @@
                     text: hotspotSetupDialog.stored ? i18n.tr("Change") :
                         i18n.tr("Start")
                     enabled: settingsValid()
+
+                    // FIXME: Workaround for lp:1415023
                     activeFocusOnPress: false
                     onClicked: {
                         if (!Connectivity.wifiEnabled &&
@@ -309,8 +364,7 @@
                     }
                 }
 
-                Connectivity.hotspotSsid = ssidField.text;
-                Connectivity.hotspotPassword = passwordField.text;
+                hotspotSetupDialog.updateHotspotSettings();
                 Connectivity.hotspotEnabledUpdated.connect(hotspotEnabledHandler);
                 Connectivity.hotspotEnabled = true;
             }
@@ -338,8 +392,7 @@
                     }
                 }
 
-                Connectivity.hotspotSsid = ssidField.text;
-                Connectivity.hotspotPassword = passwordField.text;
+                hotspotSetupDialog.updateHotspotSettings();
 
                 if (Connectivity.hotspotEnabled) {
                     hotspotSetupDialog.state = "STARTING";
 
=== modified file 'plugins/hotspot/PageComponent.qml'
--- plugins/hotspot/PageComponent.qml	2015-08-17 21:41:30 +0000
+++ plugins/hotspot/PageComponent.qml	2015-09-10 15:34:03 +0000
@@ -25,11 +25,6 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Connectivity 1.0
 
-/* This is a temporary solution to the issue of Hotspots failing on mako. If
-the device is mako, we hide the hotspot entry. Will be removed once lp:1434591
-has been resolved. */
-import Ubuntu.SystemSettings.Update 1.0
-
 ItemPage {
 
     id: root
@@ -40,10 +35,8 @@
         State {
             name: "disabled"
             // Undefined WifiEnabled means Connectivity is unavailable.
-            // Disable for mako (see lp:1434591).
-            when: (typeof Connectivity.wifiEnabled === "undefined" ||
-                   UpdateManager.deviceName === "mako") ||
-                   Connectivity.FlightMode
+            when: typeof Connectivity.wifiEnabled === "undefined" ||
+                  Connectivity.FlightMode
             PropertyChanges {
                 target: hotspotItem
                 enabled: false
@@ -124,7 +117,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 width: parent.width - units.gu(4)
                 text: Connectivity.hotspotStored ?
-                    i18n.tr("Change password/setup…") : i18n.tr("Set up hotspot…")
+                    i18n.tr("Change Password/Setup…") : i18n.tr("Set Up Hotspot…")
                 onClicked: {
                     setup.setSource(Qt.resolvedUrl("HotspotSetup.qml"));
                     PopupUtils.open(setup.item, root, {});
 
=== modified file 'plugins/hotspot/hotspot.settings'
--- plugins/hotspot/hotspot.settings	2015-08-12 15:06:37 +0000
+++ plugins/hotspot/hotspot.settings	2015-09-10 15:34:03 +0000
@@ -1,6 +1,7 @@
 {
     "icon": "preferences-network-hotspot-symbolic",
     "name": "Hotspot",
+    "plugin": "hotspot-plugin",
     "translations": "ubuntu-system-settings",
     "category": "network",
     "priority": 2,
@@ -13,6 +14,6 @@
         "tethering"
     ],
     "has-dynamic-keywords": false,
-    "has-dynamic-visibility": false,
+    "has-dynamic-visibility": true,
     "page-component": "PageComponent.qml"
 }
 
=== added directory 'plugins/hotspot/plugin'
=== added file 'plugins/hotspot/plugin/CMakeLists.txt'
--- plugins/hotspot/plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/hotspot/plugin/CMakeLists.txt	2015-09-10 15:34:03 +0000
@@ -0,0 +1,8 @@
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_definitions(-DQT_NO_KEYWORDS)
+
+add_library(hotspot-plugin SHARED hotspot-plugin.h hotspot-plugin.cpp)
+qt5_use_modules(hotspot-plugin Core Qml DBus)
+target_link_libraries(hotspot-plugin SystemSettings)
+install(TARGETS hotspot-plugin DESTINATION ${PLUGIN_MODULE_DIR})
 
=== added file 'plugins/hotspot/plugin/hotspot-plugin.cpp'
--- plugins/hotspot/plugin/hotspot-plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/hotspot/plugin/hotspot-plugin.cpp	2015-09-10 15:34:03 +0000
@@ -0,0 +1,88 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "hotspot-plugin.h"
+
+#include <QDBusInterface>
+#include <QDBusPendingReply>
+#include <QProcessEnvironment>
+#include <QtDBus>
+#include <SystemSettings/ItemBase>
+
+using namespace SystemSettings;
+
+typedef QMap<QString,QString> VersionDetail;
+Q_DECLARE_METATYPE(VersionDetail)
+
+class HotspotItem: public ItemBase
+{
+    Q_OBJECT
+
+public:
+    explicit HotspotItem(const QVariantMap &staticData, QObject *parent = 0);
+    void setVisibility(bool visible);
+};
+
+
+HotspotItem::HotspotItem(const QVariantMap &staticData, QObject *parent):
+    ItemBase(staticData, parent)
+{
+    qDBusRegisterMetaType<VersionDetail>();
+
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    if (env.contains(QLatin1String("USS_SHOW_ALL_UI"))) {
+        QString showAllS = env.value("USS_SHOW_ALL_UI", QString());
+
+        if(!showAllS.isEmpty()) {
+            setVisibility(true);
+            return;
+        }
+    }
+
+    bool supportedDevice(true);
+
+    // TODO: Remove check for mako (lp:1434591).
+    QDBusInterface m_SystemServiceIface("com.canonical.SystemImage",
+                                        "/Service",
+                                        "com.canonical.SystemImage",
+                                        QDBusConnection::systemBus());
+    QDBusPendingReply<int, QString, QString, QString, QMap<QString, QString> > reply = m_SystemServiceIface.call("Info");
+    reply.waitForFinished();
+    if (reply.isValid()) {
+        QString device = reply.argumentAt<1>();
+        supportedDevice = !(device == "mako" || device == "flo");
+    }
+
+    setVisibility(supportedDevice);
+}
+
+void HotspotItem::setVisibility(bool visible)
+{
+    setVisible(visible);
+}
+
+ItemBase *HotspotPlugin::createItem(const QVariantMap &staticData,
+                                 QObject *parent)
+{
+    return new HotspotItem(staticData, parent);
+}
+
+#include "hotspot-plugin.moc"
 
=== added file 'plugins/hotspot/plugin/hotspot-plugin.h'
--- plugins/hotspot/plugin/hotspot-plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/hotspot/plugin/hotspot-plugin.h	2015-09-10 15:34:03 +0000
@@ -0,0 +1,39 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef SYSTEM_SETTINGS_HOTSPOT_PLUGIN_H
+#define SYSTEM_SETTINGS_HOTSPOT_PLUGIN_H
+
+#include <QObject>
+#include <SystemSettings/PluginInterface>
+
+class HotspotPlugin: public QObject, public SystemSettings::PluginInterface2
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
+    Q_INTERFACES(SystemSettings::PluginInterface2)
+
+public:
+    SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
+                                         QObject *parent = 0);
+};
+
+#endif // SYSTEM_SETTINGS_HOTSPOT_PLUGIN_H
 
=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2015-08-25 14:09:22 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2015-09-10 15:34:03 +0000
@@ -394,8 +394,11 @@
         if config:
             if 'ssid' in config:
                 setup.set_ssid(config['ssid'])
+            if 'auth' in config:
+                setup.set_auth(config['auth'])
             if 'password' in config:
                 setup.set_password(config['password'])
+        utils.dismiss_osk()
         setup.enable()
         if setup:
             setup.wait_until_destroyed()
@@ -456,6 +459,11 @@
         return self.wait_select_single(
             'Button', objectName='confirmButton')
 
+    @property
+    def _password_required_check(self):
+        return self.wait_select_single(
+            'CheckBox', objectName='passwordRequiredToggle')
+
     @autopilot.logging.log_action(logger.debug)
     def set_ssid(self, ssid):
         self._ssid_field.write(ssid)
@@ -465,6 +473,13 @@
         self._password_field.write(password)
 
     @autopilot.logging.log_action(logger.debug)
+    def set_auth(self, auth):
+        if auth == 'wpa-psk':
+            self._password_required_check.check()
+        else:
+            self._password_required_check.uncheck()
+
+    @autopilot.logging.log_action(logger.debug)
     def enable(self):
         self.pointing_device.click_object(self._enable_button)
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
--- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-08-06 20:05:56 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2015-09-10 15:34:03 +0000
@@ -173,6 +173,75 @@
         self.add_mock_battery()
 
 
+class UbuntuSystemSettingsHotspotTestCase(UbuntuSystemSettingsTestCase,
+                                          dbusmock.DBusTestCase):
+    """Base class for tests that tests the hotspot functionality."""
+    connectivity_parameters = {}
+    indicatornetwork_parameters = {}
+    systemimage_parameters = {'device': 'ideal'}
+
+    @classmethod
+    def setUpClass(cls):
+        cls.session_con = cls.get_dbus(False)
+
+        cls.start_system_bus()
+
+        si_tmpl = os.path.join(os.path.dirname(__file__), 'systemimage.py')
+        (cls.si_mock, cls.si_obj) = cls.spawn_server_template(
+            si_tmpl, parameters=cls.systemimage_parameters,
+            stdout=subprocess.PIPE)
+
+        super(UbuntuSystemSettingsHotspotTestCase, cls).setUpClass()
+
+    def setUp(self):
+        if is_process_running(INDICATOR_NETWORK):
+            _stop_process(INDICATOR_NETWORK)
+            self.addCleanup(_start_process, INDICATOR_NETWORK)
+
+        ctv_tmpl = os.path.join(os.path.dirname(__file__), 'connectivity.py')
+        (self.ctv_mock, self.obj_ctv) = self.spawn_server_template(
+            ctv_tmpl, parameters=self.connectivity_parameters,
+            stdout=subprocess.PIPE)
+
+        self.ctv_private = dbus.Interface(
+            self.session_con.get_object(CTV_IFACE, CTV_PRIV_OBJ),
+            'org.freedesktop.DBus.Properties')
+
+        self.ctv_nets = dbus.Interface(
+            self.session_con.get_object(CTV_IFACE, CTV_NETS_OBJ),
+            'org.freedesktop.DBus.Properties')
+
+        inetwork = os.path.join(
+            os.path.dirname(__file__), 'indicatornetwork.py'
+        )
+        (self.inetwork_mock, self.obj_inetwork) = self.spawn_server_template(
+            inetwork, parameters=self.indicatornetwork_parameters,
+            stdout=subprocess.PIPE)
+
+        super(UbuntuSystemSettingsHotspotTestCase, self).setUp()
+
+    def tearDown(self):
+        self.ctv_mock.terminate()
+        self.ctv_mock.wait()
+        self.inetwork_mock.terminate()
+        self.inetwork_mock.wait()
+        super(UbuntuSystemSettingsHotspotTestCase, self).tearDown()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.si_mock.terminate()
+        cls.si_mock.wait()
+        if dbusmock.DBusTestCase.system_bus_pid is not None:
+            cls.stop_dbus(dbusmock.DBusTestCase.system_bus_pid)
+            del os.environ['DBUS_SYSTEM_BUS_ADDRESS']
+            dbusmock.DBusTestCase.system_bus_pid = None
+        if dbusmock.DBusTestCase.session_bus_pid is not None:
+            cls.stop_dbus(dbusmock.DBusTestCase.session_bus_pid)
+            del os.environ['DBUS_SESSION_BUS_ADDRESS']
+            dbusmock.DBusTestCase.session_bus_pid = None
+        super(UbuntuSystemSettingsHotspotTestCase, cls).tearDownClass()
+
+
 class UbuntuSystemSettingsOfonoTestCase(UbuntuSystemSettingsTestCase,
                                         dbusmock.DBusTestCase):
     """Class for cellular tests which sets up an Ofono mock """
@@ -395,52 +464,12 @@
             context.SetProperty(key, value)
 
 
-class HotspotBaseTestCase(UbuntuSystemSettingsTestCase,
-                          dbusmock.DBusTestCase):
-
-    connectivity_parameters = {}
-    indicatornetwork_parameters = {}
-
-    @classmethod
-    def setUpClass(cls):
-        cls.session_con = cls.get_dbus(False)
-        super(HotspotBaseTestCase, cls).setUpClass()
+class HotspotBaseTestCase(UbuntuSystemSettingsHotspotTestCase):
 
     def setUp(self):
-        if is_process_running(INDICATOR_NETWORK):
-            _stop_process(INDICATOR_NETWORK)
-            self.addCleanup(_start_process, INDICATOR_NETWORK)
-
-        ctv_tmpl = os.path.join(os.path.dirname(__file__), 'connectivity.py')
-        (self.ctv_mock, self.obj_ctv) = self.spawn_server_template(
-            ctv_tmpl, parameters=self.connectivity_parameters,
-            stdout=subprocess.PIPE)
-
-        self.ctv_private = dbus.Interface(
-            self.session_con.get_object(CTV_IFACE, CTV_PRIV_OBJ),
-            'org.freedesktop.DBus.Properties')
-
-        self.ctv_nets = dbus.Interface(
-            self.session_con.get_object(CTV_IFACE, CTV_NETS_OBJ),
-            'org.freedesktop.DBus.Properties')
-
-        inetwork = os.path.join(
-            os.path.dirname(__file__), 'indicatornetwork.py'
-        )
-        (self.inetwork_mock, self.obj_inetwork) = self.spawn_server_template(
-            inetwork, parameters=self.indicatornetwork_parameters,
-            stdout=subprocess.PIPE)
-
         super(HotspotBaseTestCase, self).setUp()
         self.hotspot_page = self.main_view.go_to_hotspot_page()
 
-    def tearDown(self):
-        self.ctv_mock.terminate()
-        self.ctv_mock.wait()
-        self.inetwork_mock.terminate()
-        self.inetwork_mock.wait()
-        super(HotspotBaseTestCase, self).tearDown()
-
 
 class BluetoothBaseTestCase(UbuntuSystemSettingsTestCase):
 
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/connectivity.py'
--- tests/autopilot/ubuntu_system_settings/tests/connectivity.py	2015-08-17 15:35:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/connectivity.py	2015-09-10 15:34:03 +0000
@@ -47,6 +47,10 @@
     self.SetProperty(PRIV_OBJ, PRIV_IFACE, 'HotspotPassword', value)
 
 
+def set_hotspot_auth(self, value):
+    self.SetProperty(PRIV_OBJ, PRIV_IFACE, 'HotspotAuth', value)
+
+
 def set_wifi_enabled(self, value):
     self.SetProperty(NETS_OBJ, NETS_IFACE, 'WifiEnabled', value)
 
@@ -59,6 +63,7 @@
     mock.set_hotspot_ssid = set_hotspot_ssid
     mock.set_hotspot_password = set_hotspot_password
     mock.set_wifi_enabled = set_wifi_enabled
+    mock.set_hotspot_auth = set_hotspot_auth
 
     mock.AddObject(
         NETS_OBJ,
@@ -95,6 +100,9 @@
         {
             'HotspotPassword': _parameters.get(
                 'HotspotPassword', dbus.String('abcdefgh')
+            ),
+            'HotspotAuth': _parameters.get(
+                'HotspotAuth', dbus.String('wpa-psk')
             )
         },
         [
@@ -123,6 +131,10 @@
                 'objects["/"].set_hotspot_password(self, args[0])'
             ),
             (
+                'SetHotspotAuth', 's', '',
+                'objects["/"].set_hotspot_auth(self, args[0])'
+            ),
+            (
                 'SetHotspotEnabled', 'b', '',
                 'objects["/"].set_hotspot_enabled(self, args[0])'
             ),
 
=== added file 'tests/autopilot/ubuntu_system_settings/tests/systemimage.py'
--- tests/autopilot/ubuntu_system_settings/tests/systemimage.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/systemimage.py	2015-09-10 15:34:03 +0000
@@ -0,0 +1,48 @@
+'''system image D-BUS mock template'''
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 3 of the License, or (at your option) any
+# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
+# of the license.
+import dbus
+
+__author__ = 'Jonas G. Drange'
+__email__ = '[e-mail]'
+__copyright__ = '(c) 2015 Canonical Ltd.'
+__license__ = 'LGPL 3+'
+
+BUS_NAME = 'com.canonical.SystemImage'
+MAIN_IFACE = 'com.canonical.SystemImage'
+MAIN_OBJ = '/Service'
+SYSTEM_BUS = True
+
+
+def load(mock, parameters):
+    global _parameters
+    _parameters = parameters
+
+    mock.props = {
+        'build_number': _parameters.get('build_number', 0),
+        'device': _parameters.get('device', ''),
+        'channel': _parameters.get('channel', ''),
+        'last_update_date': _parameters.get('last_update_date', ''),
+        'last_check_date': _parameters.get('last_check_date', ''),
+        'target_build_number': _parameters.get('target_build_number', -1),
+        'target_version_detail': _parameters.get('target_version_detail', ''),
+        'version_detail': _parameters.get(
+            'version_detail', dbus.Dictionary({}, signature='ss')
+        )
+    }
+
+
[e-mail](MAIN_IFACE,
+                     in_signature='', out_signature='isssa{ss}')
+def Info(self):
+    return (
+        self.props['build_number'],
+        self.props['device'],
+        self.props['channel'],
+        self.props['last_update_date'],
+        self.props['version_detail']
+    )
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_hotspot.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_hotspot.py	2015-08-17 15:35:08 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_hotspot.py	2015-09-10 15:34:03 +0000
@@ -56,6 +56,26 @@
             Eventually(Equals(True))
         )
 
+    def test_insecure_setup(self):
+        ssid = 'bar'
+        auth = 'none'
+        config = {'ssid': ssid, 'auth': auth}
+
+        self.hotspot_page.setup_hotspot(config)
+
+        # Assert that the switch is on.
+        self.assertTrue(self.hotspot_page.get_hotspot_status())
+
+        self.assertThat(
+            lambda: self.ctv_private.Get(CTV_PRIV_IFACE, 'HotspotAuth'),
+            Eventually(Equals(auth))
+        )
+
+        self.assertThat(
+            lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotStored'),
+            Eventually(Equals(True))
+        )
+
 
 class HotspotExistsTestCase(HotspotBaseTestCase):
 
@@ -80,8 +100,7 @@
 
     def test_changing(self):
         ssid = 'bar'
-        password = 'zomgzomg'
-        config = {'ssid': ssid, 'password': password}
+        config = {'ssid': ssid}
         self.hotspot_page.setup_hotspot(config)
 
         self.assertThat(
@@ -91,11 +110,6 @@
             Eventually(Equals(ssid))
         )
 
-        self.assertThat(
-            lambda: self.ctv_private.Get(CTV_PRIV_IFACE, 'HotspotPassword'),
-            Eventually(Equals(password))
-        )
-
 
 class HotspotRunningTestCase(HotspotBaseTestCase):
 
@@ -166,8 +180,7 @@
 
     def test_setup(self):
         ssid = 'bar'
-        password = 'zomgzomg'
-        config = {'ssid': ssid, 'password': password}
+        config = {'ssid': ssid}
 
         self.assertThat(
             lambda: self.ctv_nets.Get(CTV_NETS_IFACE, 'HotspotStored'),
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_plugins.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2015-08-13 13:31:31 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_plugins.py	2015-09-10 15:34:03 +0000
@@ -12,7 +12,8 @@
 from ubuntu_system_settings.tests import (
     UbuntuSystemSettingsTestCase,
     UbuntuSystemSettingsUpowerTestCase,
-    UbuntuSystemSettingsBatteryTestCase
+    UbuntuSystemSettingsBatteryTestCase,
+    UbuntuSystemSettingsHotspotTestCase
 )
 from ubuntu_system_settings.utils.i18n import ugettext as _
 
@@ -175,3 +176,16 @@
             objectName='entryComponent-battery'
         )
         self.assertThat(plugin, NotEquals(None))
+
+
+class SystemSettingsHotspotTestCases(UbuntuSystemSettingsHotspotTestCase):
+    systemimage_parameters = {'device': 'mako'}
+
+    # TODO: remove once lp:1434591 has been resolved.
+    def test_hotspot_plugin(self):
+        """ Checks that the Hotspot plugin is not available
+        as it is broken on mako."""
+        self.assertThat(lambda: self.main_view.select_single(
+            objectName='entryComponent-hotspot'),
+            raises(StateNotFoundError)
+        )