Merge branch 'master' into beta

tonesto7 · Mar 7, 2024 · 2353db4 · 2353db4
2 parents 137f8fd + dd9b916
commit 2353db4
Show file tree

Hide file tree

Showing 10 changed files with 323 additions and 257 deletions.
diff --git a/CHANGELOG.html b/CHANGELOG.html
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+### _**Release (v4.2.4.0) - [March 7th, 2024]**_
+
+#### _***All Apps and Devices***_
+
+- [FIX] Removed getDeviceActivity errors @nh_shotfam.
+- [NEW] Added support for newer devices.
+
+### _**Release (v4.2.3.0) - [August 21st, 2023]**_
+
+#### _***All Apps and Devices***_
+
+- [FIX] Fixes submitted by @nh_shotfam.
+- [FIX] Fixed some ui issues with the Actions app.
+- [FIX] Disabled the GetPlaylists command for now as it's not working.
+
 ### _**Release (v4.2.2.0) - [December 22nd, 2022]**_
 
 #### _***All Apps and Devices***_

diff --git a/apps/echo-speaks-actions.groovy b/apps/echo-speaks-actions.groovy
@@ -1,7 +1,8 @@
+/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
 /**
  *  Echo Speaks Actions (Hubitat)
  *
- *  Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
+ *  Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024  Anthony Santilli
  *  Code Contributions by @nh.schottfam
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -32,8 +33,8 @@ import java.util.concurrent.Semaphore
 //************************************************
 //*               STATIC VARIABLES               *
 //************************************************
-@Field static final String appVersionFLD  = '4.2.2.0'
-@Field static final String appModifiedFLD = '2022-12-22'
+@Field static final String appVersionFLD  = '4.2.4.0'
+@Field static final String appModifiedFLD = '2024-03-07'
 @Field static final Boolean devModeFLD    = false
 @Field static final String sNULL          = (String)null
 @Field static final String sBLANK         = ''

diff --git a/apps/echo-speaks-zones.groovy b/apps/echo-speaks-zones.groovy
@@ -1,7 +1,8 @@
+/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
 /**
  *  Echo Speaks - Zones (Hubitat)
  *
- *  Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
+ *  Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
  *  Code Contributions by @nh.schottfam
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -28,8 +29,8 @@ import java.util.concurrent.Semaphore
 //************************************************
 //*               STATIC VARIABLES               *
 //************************************************
-@Field static final String appVersionFLD  = '4.2.2.0'
-@Field static final String appModifiedFLD = '2022-12-22'
+@Field static final String appVersionFLD  = '4.2.4.0'
+@Field static final String appModifiedFLD = '2024-03-07'
 @Field static final String sNULL          = (String)null
 @Field static final String sBLANK         = ''
 @Field static final String sSPACE         = ' '

diff --git a/apps/echo-speaks.groovy b/apps/echo-speaks.groovy
diff --git a/drivers/echo-speaks-device.groovy b/drivers/echo-speaks-device.groovy
@@ -1,7 +1,8 @@
+/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
 /**
  *	Echo Speaks Device (Hubitat ONLY)
  *
- *  Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
+ *  Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
  *  Code Contributions by @nh.schottfam
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -25,8 +26,8 @@ import java.text.SimpleDateFormat
 //************************************************
 //*               STATIC VARIABLES               *
 //************************************************
-@Field static final String devVersionFLD  = '4.2.2.0'
-@Field static final String devModifiedFLD = '2022-12-22'
+@Field static final String devVersionFLD  = '4.2.4.0'
+@Field static final String devModifiedFLD = '2024-03-07'
 @Field static final String sNULL          = (String)null
 @Field static final String sBLANK         = ''
 @Field static final String sSPACE         = ' '
@@ -615,7 +616,7 @@ void refreshData(Boolean full=false) {
     // logTrace("permissions: ${state.permissions}")
     if((Boolean)state.permissions?.mediaPlayer && (full || mfull || !wsActive)) {
         getPlaybackState()
-        if(!isWHA) { getPlaylists() }
+        // if(!isWHA) { getPlaylists() }
     }
     if(!isWHA) {
         if (full || mfull) {

diff --git a/drivers/echo-speaks-zone-device.groovy b/drivers/echo-speaks-zone-device.groovy
@@ -1,7 +1,8 @@
+/* groovylint-disable CompileStatic, MethodCount, MethodSize, UnnecessaryGetter */
 /**
- *	Echo Speaks Zone Device (Hubitat ONLY)
+ *    Echo Speaks Zone Device (Hubitat ONLY)
  *
- *  Copyright 2018, 2019, 2020, 2021, 2022, 2023 Anthony Santilli
+ *  Copyright 2018, 2019, 2020, 2021, 2022, 2023, 2024 Anthony Santilli
  *  Code Contributions by @nh.schottfam
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
@@ -25,8 +26,8 @@ import java.text.SimpleDateFormat
 //************************************************
 //*               STATIC VARIABLES               *
 //************************************************
-@Field static final String devVersionFLD  = '4.2.2.0'
-@Field static final String devModifiedFLD = '2022-12-22'
+@Field static final String devVersionFLD  = '4.2.4.0'
+@Field static final String devModifiedFLD = '2024-03-07'
 @Field static final String sNULL          = (String)null
 @Field static final String sBLANK         = ''
 @Field static final String sSPACE         = ' '
@@ -97,7 +98,7 @@ metadata {
         attribute "volume", "number"
         attribute "wakeWords", "enum"
         attribute "wasLastSpokenToDevice", "string"
-	    
+        
         attribute "audioTrackData", "JSON_OBJECT" // To support SharpTools.io Album Art feature
 
         command "replayText"
@@ -258,7 +259,7 @@ String getEchoAccountId() { return (String)state.deviceAccountId ?: sNULL }
 
 Map getEchoDevInfo(String cmd, Boolean ignoreDoNotDisturb=false) {
     if(isCommandTypeAllowed(cmd, false, ignoreDoNotDisturb)) {
-	    return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
+        return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
     }
    return null
 }
@@ -615,7 +616,7 @@ void refreshData(Boolean full=false) {
     // logTrace("permissions: ${state.permissions}")
     if((Boolean)state.permissions?.mediaPlayer && (full || mfull || !wsActive)) {
         getPlaybackState()
-        if(!isWHA) { getPlaylists() }
+        // if(!isWHA) { getPlaylists() }
     }
     if(!isWHA) {
         if (full || mfull) {
@@ -1195,7 +1196,7 @@ private String sendAmazonCommand(String method, Map params, Map otherData=null)
 private Map getDeviceData(){
     return [deviceType: getEchoDeviceType(), serialNumber: getEchoSerial(), owner: getEchoOwner(), account: getEchoAccountId(), dni: device.deviceNetworkId]
 //Map getEchoDevInfo(cmd) {
-//	return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
+//    return [deviceTypeId: getEchoDeviceType(), deviceSerialNumber: getEchoSerial(), deviceOwnerCustomerId: getEchoOwner(), deviceAccountId: getEchoAccountId(), dni: device.deviceNetworkId ]
 }
 
 private void sendSequenceCommand(String type, String command, value=null, String callback=sNULL) {

diff --git a/packageManifest.json b/packageManifest.json
@@ -1,9 +1,9 @@
 {
     "packageName": "Echo Speaks",
     "author": "Anthony S.",
-    "version": "4.2.2.0",
+    "version": "4.2.4.0",
     "minimumHEVersion": "2.2.4",
-    "dateReleased": "2022-12-22",
+    "dateReleased": "2023-08-21",
     "documentationLink": "https://tonesto7.github.io/echo-speaks-docs",
     "communityLink": "https://community.hubitat.com/t/release-echo-speaks-v4/68843",
     "licenseFile": "",
@@ -16,7 +16,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks.groovy",
             "required": true,
             "oauth": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "cd4762db-aa0b-4d32-98ca-06de955dbc33",
@@ -25,7 +25,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks-actions.groovy",
             "required": true,
             "oauth": false,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "50ad91a0-eb51-4d6f-98d2-f1654221baa9",
@@ -34,7 +34,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/apps/echo-speaks-zones.groovy",
             "required": true,
             "oauth": false,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         }
     ],
     "drivers": [
@@ -44,15 +44,15 @@
             "namespace": "tonesto7",
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/drivers/echo-speaks-device.groovy",
             "required": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "afac5950-3dc0-4109-95ec-79aa3c7ef208",
             "name": "Echo Speaks Zone Device",
             "namespace": "tonesto7",
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/master/drivers/echo-speaks-zone-device.groovy",
             "required": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         }
     ]
 }
diff --git a/packageManifestBeta.json b/packageManifestBeta.json
@@ -1,9 +1,9 @@
 {
     "packageName": "Echo Speaks (Beta)",
     "author": "Anthony S.",
-    "version": "4.2.2.0",
+    "version": "4.2.4.0",
     "minimumHEVersion": "2.2.4",
-    "dateReleased": "2022-12-22",
+    "dateReleased": "2023-08-21",
     "documentationLink": "https://tonesto7.github.io/echo-speaks-docs",
     "communityLink": "https://community.hubitat.com/t/beta-echo-speaks-v4/66503",
     "licenseFile": "",
@@ -16,7 +16,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks.groovy",
             "required": true,
             "oauth": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "cd4762db-aa0b-4d32-98ca-06de955dbc33",
@@ -25,7 +25,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks-actions.groovy",
             "required": true,
             "oauth": false,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "50ad91a0-eb51-4d6f-98d2-f1654221baa9",
@@ -34,7 +34,7 @@
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/apps/echo-speaks-zones.groovy",
             "required": true,
             "oauth": false,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         }
     ],
     "drivers": [
@@ -44,15 +44,15 @@
             "namespace": "tonesto7",
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/drivers/echo-speaks-device.groovy",
             "required": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         },
         {
             "id": "afac5950-3dc0-4109-95ec-79aa3c7ef208",
             "name": "Echo Speaks Zone Device",
             "namespace": "tonesto7",
             "location": "https://raw.githubusercontent.com/tonesto7/echo-speaks/beta/drivers/echo-speaks-zone-device.groovy",
             "required": true,
-            "version": "4.2.2.0"
+            "version": "4.2.4.0"
         }
     ]
 }
diff --git a/resources/appData.json b/resources/appData.json
@@ -2,22 +2,22 @@
     "appDataVer": "4.0",
     "versions": {
         "mainApp": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "actionApp": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "zoneApp": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "echoDevice": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "zoneChildDevice": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "wsDevice": {
-            "ver": "4.2.2.0"
+            "ver": "4.2.4.0"
         },
         "server": {
             "ver": "2.7.0"