Merge ~knitzsche/snappy-hwe-snaps/+git/wifi-connect:1729409-externally-delete-wifi-connection into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-connect:master

[Kyle Nitzsche]

Restore support for externally disconnecting wifi-connection such that daemon notices via netman dbus call and reconfigs to Management mode so user can join and connect to external AP.

Note: the regression was not published in snap and using Operational Portal to disconnect still worked.

Fixes LP:1729409

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:713efd2f1e052f3b77ccfe046488373cde4cbd55
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/44/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/93/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/93
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/93
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/93/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/892/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/639
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/659/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/44/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: cd02dcda772ef305497659820939b00accc69563

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/954/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:cd02dcda772ef305497659820939b00accc69563
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/109/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/159/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/159/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/159/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/159/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/954
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/701
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/722/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/109/rebuild

review: Needs Fixing (continuous-integration)

fadd1eb... by Kyle Nitzsche <email address hidden> on 2017-11-30

Fix go fmt errors to pass CI

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 8e4586630ae4256622664f1d9f70473299c5eb07

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/955/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:8e4586630ae4256622664f1d9f70473299c5eb07
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/110/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/160/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/160/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/160/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/160/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/955
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/702
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/723/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/110/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 8e4586630ae4256622664f1d9f70473299c5eb07

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/956/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:8e4586630ae4256622664f1d9f70473299c5eb07
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/111/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/161/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/161/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/161/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/161/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/956
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/703
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/724/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/111/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 8e4586630ae4256622664f1d9f70473299c5eb07

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/958/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:8e4586630ae4256622664f1d9f70473299c5eb07
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/113/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/163/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/163
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/163
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/163
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/958
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/705
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/726/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/113/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: 8e4586630ae4256622664f1d9f70473299c5eb07

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/959/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:8e4586630ae4256622664f1d9f70473299c5eb07
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/114/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/164/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/164
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/164
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/164
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/959
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/706
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/727/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/114/rebuild

review: Needs Fixing (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Successfully build documentation, rev: fadd1eb55eedc3e3f7c3901f3c6f48de26ef9dd1

Generated documentation is available at https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/970/

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:fadd1eb55eedc3e3f7c3901f3c6f48de26ef9dd1
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/127/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/177/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/177
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/177
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/177
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/970
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/717
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/738/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/127/rebuild

review: Needs Fixing (continuous-integration)

Unmerged commits

fadd1eb... by Kyle Nitzsche <email address hidden> on 2017-11-30

Fix go fmt errors to pass CI

cd02dcd... by Kyle Nitzsche on 2017-11-01

fix lp:1729409 deamon detects external wifi disconnect

Fixes regression in masterxi (not in published snap). The regression
meant that externally originated disconnects from AP were not
detected by wifi-connect, thus system state did not recover and
user could not join and connect to another external AP. The fix
involves daemon checking whether wifi is connected through netman dbus
call, then doing the right things, instead of merely checking for
state file.

1b216ec... by System Enablement CI Bot <email address hidden> on 2017-10-24

Merge remote tracking branch join-after-fail-regress-1726567

Merge-Proposal: https://code.launchpad.net/~knitzsche/snappy-hwe-snaps/+git/wifi-connect/+merge/332672

Author: Kyle Nitzsche <email address hidden>

fix https://bugs.launchpad.net/snappy-hwe-snaps/+bug/1726567

A regression that prevents joining AP after a failed attempt to join

diff --git a/server/handlers.go b/server/handlers.go
index cb0998d..3fd10d4 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -207,7 +207,7 @@ func ConnectHandler(w http.ResponseWriter, r *http.Request) {
 		waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
 		utils.RemoveFlagFile(waitPath)
 
-                // attempt to connect to external AP
+		// attempt to connect to external AP
 		err = netmanClient.ConnectAp(ssid, pwd, ap2device, ssid2ap)
 		//TODO signal user in portal on failure to connect
 		if err != nil {
diff --git a/service/service.go b/service/service.go
index 568b3dd..133b79e 100644
--- a/service/service.go
+++ b/service/service.go
@@ -88,14 +88,6 @@ func main() {
 			continue
 		}
 
-		// wait/loop until management portal's wait flag file is gone
-		// this stops daemon State changing until the management portal
-		// is done, either stopped or the user has attempted to connect to
-		// an external AP
-		if client.CheckWaitApConnect() {
-			continue
-		}
-
 		// if an external wifi connection, we are in Operational mode
 		// and we stay here until there is an external wifi connection
 		if c.ConnectedWifi(c.GetWifiDevices(c.GetDevices())) {
@@ -110,6 +102,18 @@ func main() {
 				client.OperationalServerUp()
 			}
 			continue
+		} else {
+			//remove flag file so that daemon starts checking state
+			//and takes control again
+			waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
+			utils.RemoveFlagFile(waitPath)
+			// wait/loop until management portal's wait flag file is gone
+			// this stops daemon State changing until the management portal
+			// is done, either stopped or the user has attempted to connect to
+			// an external AP
+			if client.CheckWaitApConnect() {
+				continue
+			}
 		}
 
 		client.SetState(daemon.MANAGING)
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 6826057..1a580fc 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: wifi-connect 
-version: 0.10-2-dev
+version: 0.10-3-dev
 summary: Connect your device to external wifi over temp wifi AP
 description: |
   A solution to enable your device to connect to an external