demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 23:22:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[avmfritz] Minor improvements in code an documentation (#9464)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2020-12-23 00:30:04 +01:00 committed by GitHub
parent e648fc6c8c
commit 46b02c5b6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.avmfritz/README.md
View File

@ -160,9 +160,9 @@ The AIN (actor identification number) can be found in the FRITZ!Box interface ->
| Channel Type ID | Item Type | Description | Available on thing | | Channel Type ID | Item Type | Description | Available on thing |
|-----------------|--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------| |-----------------|--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
| incoming_call | Call | Details about incoming call. | FRITZ!Box | | incoming_call | Call | Details about incoming call. %2$s contains the external, calling number, %1$s is the internal, receiving number. | FRITZ!Box |
| outgoing_call | Call | Details about outgoing call. | FRITZ!Box | | outgoing_call | Call | Details about outgoing call. %1$s contains the external, called number, %2$s is the internal, calling number. | FRITZ!Box |
| active_call | Call | Details about active call. | FRITZ!Box | | active_call | Call | Details about active call. %1$s contains the external, calling number, %2$s is empty. | FRITZ!Box |
| call_state | String | Details about current call state, either IDLE, RINGING, DIALING or ACTIVE. | FRITZ!Box | | call_state | String | Details about current call state, either IDLE, RINGING, DIALING or ACTIVE. | FRITZ!Box |
| apply_template | String | Apply template for device(s) (channel's state options contains available templates, for an alternative way see the description below) - FRITZ!OS 7 | FRITZ!Box, FRITZ!Powerline 546E | | apply_template | String | Apply template for device(s) (channel's state options contains available templates, for an alternative way see the description below) - FRITZ!OS 7 | FRITZ!Box, FRITZ!Powerline 546E |
| mode | String | States the mode of the device (MANUAL/AUTOMATIC/VACATION) | FRITZ!DECT 210, FRITZ!DECT 200, FRITZ!Powerline 546E, FRITZ!DECT 301, FRITZ!DECT 300, Comet DECT | | mode | String | States the mode of the device (MANUAL/AUTOMATIC/VACATION) | FRITZ!DECT 210, FRITZ!DECT 200, FRITZ!Powerline 546E, FRITZ!DECT 301, FRITZ!DECT 300, Comet DECT |

2
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/AVMFritzTlsTrustManagerProvider.java
View File

@ -22,7 +22,7 @@ import org.osgi.service.component.annotations.Component;
/** /**
* Provides a TrustManager to allow secure connections to any FRITZ!Box * Provides a TrustManager to allow secure connections to any FRITZ!Box
* *
* @author Chritoph Weitkamp - Initial Contribution * @author Christoph Weitkamp - Initial Contribution
*/ */
@Component @Component
@NonNullByDefault @NonNullByDefault

6
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/callmonitor/CallMonitor.java
View File

@ -45,10 +45,10 @@ public class CallMonitor {
private final int MONITOR_PORT = 1012; private final int MONITOR_PORT = 1012;
private @Nullable CallMonitorThread monitorThread; private @Nullable CallMonitorThread monitorThread;
private ScheduledFuture<?> reconnectJob; private final ScheduledFuture<?> reconnectJob;
private String ip; private final String ip;
private BoxHandler handler; private final BoxHandler handler;
public CallMonitor(String ip, BoxHandler handler, ScheduledExecutorService scheduler) { public CallMonitor(String ip, BoxHandler handler, ScheduledExecutorService scheduler) {
this.ip = ip; this.ip = ip;

14
bundles/org.openhab.binding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/BoxHandler.java
View File

@ -12,13 +12,13 @@
*/ */
package org.openhab.binding.avmfritz.internal.handler; package org.openhab.binding.avmfritz.internal.handler;
import java.util.HashSet; import static org.openhab.binding.avmfritz.internal.AVMFritzBindingConstants.*;
import java.util.Set; import java.util.Set;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable; import org.eclipse.jdt.annotation.Nullable;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.openhab.binding.avmfritz.internal.AVMFritzBindingConstants;
import org.openhab.binding.avmfritz.internal.AVMFritzDynamicCommandDescriptionProvider; import org.openhab.binding.avmfritz.internal.AVMFritzDynamicCommandDescriptionProvider;
import org.openhab.binding.avmfritz.internal.callmonitor.CallMonitor; import org.openhab.binding.avmfritz.internal.callmonitor.CallMonitor;
import org.openhab.binding.avmfritz.internal.config.AVMFritzBoxConfiguration; import org.openhab.binding.avmfritz.internal.config.AVMFritzBoxConfiguration;
@ -38,14 +38,8 @@ import org.openhab.core.types.State;
@NonNullByDefault @NonNullByDefault
public class BoxHandler extends AVMFritzBaseBridgeHandler { public class BoxHandler extends AVMFritzBaseBridgeHandler {
protected static final Set<String> CALL_CHANNELS = new HashSet<>(); private static final Set<String> CALL_CHANNELS = Set.of(CHANNEL_CALL_ACTIVE, CHANNEL_CALL_INCOMING,
static { CHANNEL_CALL_OUTGOING, CHANNEL_CALL_STATE);
// TODO: We are still on Java 8 and cannot use Set.of
CALL_CHANNELS.add(AVMFritzBindingConstants.CHANNEL_CALL_ACTIVE);
CALL_CHANNELS.add(AVMFritzBindingConstants.CHANNEL_CALL_INCOMING);
CALL_CHANNELS.add(AVMFritzBindingConstants.CHANNEL_CALL_OUTGOING);
CALL_CHANNELS.add(AVMFritzBindingConstants.CHANNEL_CALL_STATE);
}
private @Nullable CallMonitor callMonitor; private @Nullable CallMonitor callMonitor;