ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Uplift of Zutil

Browse source
This commit is contained in:
Ziver Koc 2021-09-10 22:19:02 +02:00
parent f2dfe7a88f
commit 987dab9079
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -18,7 +18,7 @@ subprojects {
apply plugin: 'java-library' apply plugin: 'java-library'
dependencies { dependencies {
implementation 'se.koc:zutil:1.0.304' implementation 'se.koc:zutil:1.0.306'
//implementation 'se.koc:zutil:1.0.0-SNAPSHOT' //implementation 'se.koc:zutil:1.0.0-SNAPSHOT'
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'

8
plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/SmartHomeImpl.java
View file

@ -25,6 +25,7 @@ import com.google.protobuf.Struct;
import com.google.protobuf.Value; import com.google.protobuf.Value;
import org.json.JSONObject; import org.json.JSONObject;
import se.hal.HalContext; import se.hal.HalContext;
import se.hal.HalServer;
import se.hal.intf.HalAbstractDevice; import se.hal.intf.HalAbstractDevice;
import se.hal.plugin.assistant.google.trait.DeviceTrait; import se.hal.plugin.assistant.google.trait.DeviceTrait;
import se.hal.plugin.assistant.google.trait.DeviceTraitFactory; import se.hal.plugin.assistant.google.trait.DeviceTraitFactory;
@ -58,6 +59,13 @@ public class SmartHomeImpl extends SmartHomeApp implements OAuth2TokenRegistrati
userAgent = HalContext.getStringProperty(CONFIG_USER_AGENT); userAgent = HalContext.getStringProperty(CONFIG_USER_AGENT);
clientId = HalContext.getStringProperty(SmartHomeDaemon.CONFIG_CLIENT_ID); clientId = HalContext.getStringProperty(SmartHomeDaemon.CONFIG_CLIENT_ID);
for (String token : HalServer.getExternalWebDaemon().getOAuth2Registry().getAccessTokens(clientId)) {
if (HalServer.getExternalWebDaemon().getOAuth2Registry().isAccessTokenValid(token)) {
onTokenRegistration(clientId,
token,
HalServer.getExternalWebDaemon().getOAuth2Registry().getAccessTokenTimeout(token));
}
}
} }