Protect ternary operations in configure

Protect ternary operations against order of operations, resulting in incorrect math and math against null values.

devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy

@@ -29,6 +29,7 @@ metadata {
 		attribute "powerSupply", "enum", ["USB Cable", "Battery"]
 
 		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A", outClusters: "0x5A"
+		fingerprint deviceId: "0x2101", inClusters: "0x5E,0x86,0x72,0x59,0x85,0x73,0x71,0x84,0x80,0x30,0x31,0x70,0x7A,0x5A"
 	}
 
 	simulator {
@@ -328,7 +329,7 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 
 def configure() {
 	// allow device user configured or default 16 min to check in; double the periodic reporting interval
-	sendEvent(name: "checkInterval", value: 2* timeOptionValueMap[reportInterval] ?: 2*8*60, displayed: false)
+	sendEvent(name: "checkInterval", value: 2* (timeOptionValueMap[reportInterval] ?: (2*8*60)), displayed: false)
 
 	// This sensor joins as a secure device if you double-click the button to include it
 	log.debug "${device.displayName} is configuring its settings"
@@ -356,7 +357,7 @@ def configure() {
 									motionSensitivity == "minimum" ? 0 : 64)
 
 	//5. report every x minutes (threshold reports don't work on battery power, default 8 mins)
-	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: 8*60) //association group 1
+	request << zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: timeOptionValueMap[reportInterval] ?: (8*60)) //association group 1
 
 	request << zwave.configurationV1.configurationSet(parameterNumber: 112, size: 4, scaledConfigurationValue: 6*60*60)  //association group 2
 

smartapps/nirajbhatt7/smartlock-notification.src/smartlock-notification.groovy

@@ -1,74 +0,0 @@
-/**
- *  SmartLock Notification
- *
- *  Copyright 2016 Someone
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "SmartLock Notification",
-    namespace: "nirajbhatt7",
-    author: "Someone",
-    description: "Sends push notification on the lock/unlock.",
-    category: "Safety & Security",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
-
-
-preferences {
-	section("Select Smart Lock/s") {
-		input "theLock", "capability.lock", title:"door lock", required: true, multiple: true
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-    subscribe(theLock, "lock", lockHandler)
-}
-
-def lockHandler(evt) {
-  sendPush("The ${evt.displayName} is ${evt.value}!")
-  
-  // just for debugging  
-  log.debug "lock is ${evt.name}"
-  log.debug "event data: ${evt.data}"
-  log.debug "event display name: ${evt.displayName}"
-  log.debug "Is this event a state change? ${evt.isStateChange()}"
-  try {
-        log.debug "The jsonValue of this event is ${evt.jsonValue}"
-    } catch (e) {
-        log.debug "Trying to get the jsonValue for ${evt.name} threw an exception: $e"
-    }
-  
-  log.debug "The source of this event is: ${evt.source}"
-  log.debug "event from physical actuation? ${evt.isPhysical()}"
-  
-  log.debug "lock status changed to ${evt.value}"
-  
-  
-  
-  
-}
-