From 7b7b842477dc1a2d040e818bc37bd7baf410b66b Mon Sep 17 00:00:00 2001
From: Norwin Roosen <github@nroo.de>
Date: Mon, 19 Nov 2018 12:45:59 +0100
Subject: [PATCH] fix compilation errors in ota-wizard

---
 src/pages/ota-wizard/ota-wizard.ts |  3 ++-
 src/providers/ota-wifi/ota-wifi.ts | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/ota-wizard/ota-wizard.ts b/src/pages/ota-wizard/ota-wizard.ts
index 837c4fd..75cf5ad 100644
--- a/src/pages/ota-wizard/ota-wizard.ts
+++ b/src/pages/ota-wizard/ota-wizard.ts
@@ -7,6 +7,7 @@ import {
 import {
   IonicPage,
   Slides,
+  NavController,
 } from 'ionic-angular'
 import { Network } from '@ionic-native/network'
 import { Subscription } from 'rxjs/Subscription';
@@ -24,7 +25,6 @@ export class OtaWizardPage implements OnInit, OnDestroy {
   offlineSub: Subscription
 
   filterSsids = false // TODO: add toggle to UI?
-  filterSsids = true
   availableSenseboxes: string[] = [] // list of SSIDs
   compiledSketch = undefined
   errorMsg = ''
@@ -39,6 +39,7 @@ export class OtaWizardPage implements OnInit, OnDestroy {
   constructor(
     private network: Network,
     private otaWifi: OtaWifiProvider,
+    private navCtrl: NavController,
   ) {
   }
 
diff --git a/src/providers/ota-wifi/ota-wifi.ts b/src/providers/ota-wifi/ota-wifi.ts
index 8573d5e..0ffcf52 100644
--- a/src/providers/ota-wifi/ota-wifi.ts
+++ b/src/providers/ota-wifi/ota-wifi.ts
@@ -56,23 +56,20 @@ export class OtaWifiProvider {
     if (this.strategy != WifiStrategy.Automatic)
       throw new Error('can not connect to WiFi network on this platform')
 
-    await this.platform.is('ios')
+    return this.platform.is('ios')
       ? WifiWizard2.iOSConnectNetwork(ssid)
       : WifiWizard2.connect(ssid, true)
-
-    // validate that the MCU server is available
-    return this.http.get(`${SENSEBOX_API}/version`).toPromise()
   }
 
   async uploadFirmware (binary: string): Promise<any> {
     // TODO: send checksum?
-    return this.http.post(`${SENSEBOX_API}/flash`, binary).toPromise()
+    return this.http.post(`${SENSEBOX_API}/flash`, binary, {
+      responseType: 'text',
+    }).toPromise()
   }
 
 }
 
-// TODO: replace with "WifiCapabilities".
-// makes it easier to check in each functions if required functionality is available
 export enum WifiStrategy {
   Automatic   = 'Automatic',   // android, iOS 11+
   Manual      = 'Manual',      // older iOS