Skip to content

Add rudimentary multi-location support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rahlvers wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add rudimentary multi-location support #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f72b6b
Add rudimentary multi-location support
rahlvers Apr 19, 2020
525d40d
Synced with latest tot changes
rahlvers Jun 2, 2020
0b3223d
Update ring-alarm-manager.groovy
rahlvers Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions smartapps/asishrs/ring-alarm-manager.src/ring-alarm-manager.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def pageStart(){
description: advancedSettingsDescription(),
image: "https://terms-612db.firebaseapp.com/ringalarm/images/noun_Settings_1713433.png"
}

section() {
paragraph title: "About",
image: "https://terms-612db.firebaseapp.com/ringalarm/images/noun_about_2508117.png",
Expand Down Expand Up @@ -332,6 +332,8 @@ def awsAPISettings() {
section("Ring Alarm AWS API Settings") {
input(name: "apiurl", type: "text", title: "API Url", required: "true", description: "Ring Alarm AWS API URL/Endpoint")
input(name: "apikey", type: "text", title: "API Key", required: "true", description: "Ring Alarm AWS API Key")
input(name: "ringLocationId", type: "text", title: "Ring Location ID", required: "true", description: "Ring Alarm Location ID")
input(name: "ringZID", type: "text", title: "Ring ZID", required: "true", description: "Ring Alarm ZID")
}

section {
Expand Down Expand Up @@ -734,7 +736,7 @@ def ringApiCall(route){
def accessKey = ringGetAccessAndRefreshToken()

if(!accessKey?.trim()) {
log.error "ringApiCall() -> Access Token is Null/Empty. Aboritng api call for route `${route}`"
log.error "ringApiCall() -> Access Token is Null/Empty. Aborting api call for route `${route}`"
return null
}

Expand All @@ -753,8 +755,8 @@ def ringApiCall(route){
password: settings.password,
refreshToken: state.ringRefreshKey,
accessToken: accessKey,
locationId: state.ringLocationId,
zid: state.ringZID,
locationId: settings.ringLocationId,
zid: settings.ringZID,
historyLimit: 10
]
]
Expand Down