Merge pull request #1630 from SmartThingsCommunity/staging

Rolling down staging to master

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -73,7 +73,7 @@ def authPage() {
 			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
 				section() {
 					paragraph "Tap below to log in to the netatmo and authorize SmartThings access."
-					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description
+					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}", description:description
 				}
 			}
 		} else {
@@ -146,18 +146,23 @@ def callback() {
 
 		// log.debug "PARAMS: ${params}"
 
+		try {
             httpPost(params) { resp ->
 
                 def slurper = new JsonSlurper()
 
                 resp.data.each { key, value ->
                     def data = slurper.parseText(key)
-
+					log.debug "Data: $data"
                     state.refreshToken = data.refresh_token
                     state.authToken = data.access_token
+                    //state.accessToken = data.access_token
                     state.tokenExpires = now() + (data.expires_in * 1000)
                     // log.debug "swapped token: $resp.data"
                 }
+            }
+        } catch (Exception e) {
+			log.debug "callback: Call failed $e"
         }
 
 		// Handle success and failure here, and render stuff accordingly
@@ -387,18 +392,18 @@ def getDeviceList() {
 	state.deviceDetail = [:]
 	state.deviceState = [:]
 
-	apiGet("/api/devicelist") { response ->
+	apiGet("/api/getstationsdata") { response ->
 		response.data.body.devices.each { value ->
 			def key = value._id
 			deviceList[key] = "${value.station_name}: ${value.module_name}"
 			state.deviceDetail[key] = value
             state.deviceState[key] = value.dashboard_data
+            value.modules.each { value2 ->            
+                def key2 = value2._id
+                deviceList[key2] = "${value.station_name}: ${value2.module_name}"
+                state.deviceDetail[key2] = value2
+                state.deviceState[key2] = value2.dashboard_data            
             }
-		response.data.body.modules.each { value ->
-			def key = value._id
-			deviceList[key] = "${state.deviceDetail[value.main_device].station_name}: ${value.module_name}"
-			state.deviceDetail[key] = value
-            state.deviceState[key] = value.dashboard_data
 		}
 	}
 
@@ -448,6 +453,7 @@ def listDevices() {
 }
 
 def apiGet(String path, Map query, Closure callback) {
+
 	if(now() >= state.tokenExpires) {
 		refreshToken();
 	}
@@ -469,9 +475,13 @@ def apiGet(String path, Map query, Closure callback) {
 		log.debug "apiGet: Call failed $e"
         if(refreshToken()) {
             log.debug "apiGet: Trying again after refreshing token"
+            try {
                 httpGet(params)	{ response ->
                     callback.call(response)
                 }
+            } catch (Exception f) {
+                log.debug "apiGet: Call failed $f"
+            }
         }
 	}
 }

smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy

@@ -137,6 +137,7 @@ def dock_sensor(device_serial, expected_plant_name) {
             contentType: "application/json",
     ]
     log.debug "Creating new plant on myplantlink.com - ${expected_plant_name}"
+    try {
         httpPost(docking_params) { docking_response ->
             if (parse_api_response(docking_response, "Docking a link")) {
                 if (docking_response.data.plants.size() == 0) {
@@ -145,6 +146,7 @@ def dock_sensor(device_serial, expected_plant_name) {
                     plant_post_body_map['links_key'] = [docking_response.data.key]
                     def plant_post_body_json_builder = new JsonBuilder(plant_post_body_map)
                     plant_post_params["body"] = plant_post_body_json_builder.toString()
+                    try {
                         httpPost(plant_post_params) { plant_post_response ->
                             if(parse_api_response(plant_post_response, 'creating plant')){
                                 def attached_map = atomicState.attached_sensors
@@ -152,6 +154,9 @@ def dock_sensor(device_serial, expected_plant_name) {
                                 atomicState.attached_sensors = attached_map
                             }
                         }
+                    } catch (Exception f) {
+                        log.debug "call failed $f"
+                    }
                 } else {
                     def plant = docking_response.data.plants[0]
                     def attached_map = atomicState.attached_sensors
@@ -161,6 +166,9 @@ def dock_sensor(device_serial, expected_plant_name) {
                 }
             }
         }
+    } catch (Exception e) {
+        log.debug "call failed $e"
+    }
     return true
 }
 
@@ -178,9 +186,13 @@ def checkAndUpdatePlantIfNeeded(plant, expected_plant_name){
         ]
         def plant_put_body_json_builder = new JsonBuilder(plant_put_body_map)
         plant_put_params["body"] = plant_put_body_json_builder.toString()
+        try {
             httpPut(plant_put_params) { plant_put_response ->
                 parse_api_response(plant_put_response, 'updating plant name')
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -198,6 +210,7 @@ def moistureHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
+        try {
             httpPost(measurement_post_params) { measurement_post_response ->
                 if (parse_api_response(measurement_post_response, 'creating moisture measurement') &&
                         measurement_post_response.data.size() >0){
@@ -218,6 +231,9 @@ def moistureHandler(event){
                     }
                 }
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -235,9 +251,13 @@ def batteryHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
+        try {
             httpPost(measurement_post_params) { measurement_post_response ->
                 parse_api_response(measurement_post_response, 'creating battery measurement')
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -275,9 +295,13 @@ def swapToken(){
     ]
 
     def jsonMap
+    try {
         httpPost(postParams) { resp ->
             jsonMap = resp.data
         }
+    } catch (Exception e) {
+        log.debug "call failed $e"
+    }
 
     atomicState.refreshToken = jsonMap.refresh_token
     atomicState.authToken = jsonMap.access_token