Merge ~knitzsche/snappy-hwe-snaps/+git/wifi-connect:join-after-fail-regress-1726567 into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-connect:master

[Kyle Nitzsche]

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

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

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

FAILED: Continuous integration, rev:f60c67aa458f1a57d621a6a3a5208e24ee369660
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/35/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/648/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Successfully build documentation, rev: 58966eccdc594547bc1d3a59e502eeb4c5b174cf

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

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

PASSED: Continuous integration, rev:58966eccdc594547bc1d3a59e502eeb4c5b174cf
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-prepare/36/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=amd64/86
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=arm64/86
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=armhf/86
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/ARCHITECTURE=i386/86
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/881
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-cleanup/629
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/649/console

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

review: Approve (continuous-integration)

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

diff --git a/snap/scriptlets/country-codes b/scriptlets/country-codes
index d4e8a97..d4e8a97 100644
--- a/snap/scriptlets/country-codes
+++ b/scriptlets/country-codes
diff --git a/snap/scriptlets/fetch_country_codes.sh b/scriptlets/fetch_country_codes.sh
index 8dae525..8dae525 100755
--- a/snap/scriptlets/fetch_country_codes.sh
+++ b/scriptlets/fetch_country_codes.sh
diff --git a/snap/scriptlets/fill_country_codes.sh b/scriptlets/fill_country_codes.sh
index 451c61b..b8babe4 100755
--- a/snap/scriptlets/fill_country_codes.sh
+++ b/scriptlets/fill_country_codes.sh
@@ -6,14 +6,14 @@
 
 set -e 
 
-COUNTRY_CODES=../../../snap/scriptlets/country-codes
+COUNTRY_CODES=../../../scriptlets/country-codes
 
 if [ ! -e $COUNTRY_CODES ]; then
     echo "======================================================="
     echo "Could not find country_codes needed file for compiling."
     echo "Please, before building snap for the first time execute by hand:"
     echo ""
-    echo "snap/scriptlets/fetch_country_codes.sh"
+    echo "scriptlets/fetch_country_codes.sh"
     echo ""
     echo "======================================================="
     exit 1
diff --git a/server/handlers.go b/server/handlers.go
index c14189f..cb0998d 100644
--- a/server/handlers.go
+++ b/server/handlers.go
@@ -198,10 +198,16 @@ func ConnectHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		//connect
+		// manage iface by netman
 		netmanClient.SetIfaceManaged("wlan0", true, netmanClient.GetWifiDevices(netmanClient.GetDevices()))
 		_, ap2device, ssid2ap := netmanClient.Ssids()
 
+		//remove flag file so that daemon starts checking state
+		//and takes control again
+		waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
+		utils.RemoveFlagFile(waitPath)
+
+                // 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 {
@@ -211,10 +217,6 @@ func ConnectHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		//remove flag file so that daemon starts checking state
-		//and takes control again
-		waitPath := os.Getenv("SNAP_COMMON") + "/startingApConnect"
-		utils.RemoveFlagFile(waitPath)
 	}()
 }
 
diff --git a/snap/snapcraft.yaml b/snapcraft.yaml
index 3a7cf44..6826057 100644
--- a/snap/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -56,6 +56,6 @@ parts:
   assets:
     plugin: dump
     source: .
-    prepare: ../../../snap/scriptlets/fill_country_codes.sh
+    prepare: ../../../scriptlets/fill_country_codes.sh
     stage:
       - static