Skip to content
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

[avmfritz] Minor improvements in code and documentation #9464

Merged
merged 1 commit into from
Dec 22, 2020
Merged

[avmfritz] Minor improvements in code and documentation #9464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bundles/org.openhab.binding.avmfritz/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
|-----------------|--------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------|
| incoming_call | Call | Details about incoming call. | FRITZ!Box |
| outgoing_call | Call | Details about outgoing call. | FRITZ!Box |
| active_call | Call | Details about active 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. %1$s contains the external, called number, %2$s is the internal, calling number. | 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 |
| 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 |
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/openhab/binding/avmfritz/internal/AVMFritzTlsTrustManagerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
/**
* Provides a TrustManager to allow secure connections to any FRITZ!Box
*
* @author Chritoph Weitkamp - Initial Contribution
* @author Christoph Weitkamp - Initial Contribution
*/
@Component
@NonNullByDefault
Expand Down
6 changes: 3 additions & 3 deletions ...avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/callmonitor/CallMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ public class CallMonitor {
private final int MONITOR_PORT = 1012;

private @Nullable CallMonitorThread monitorThread;
private ScheduledFuture<?> reconnectJob;
private final ScheduledFuture<?> reconnectJob;

private String ip;
private BoxHandler handler;
private final String ip;
private final BoxHandler handler;

public CallMonitor(String ip, BoxHandler handler, ScheduledExecutorService scheduler) {
this.ip = ip;
Expand Down
14 changes: 4 additions & 10 deletions ...ding.avmfritz/src/main/java/org/openhab/binding/avmfritz/internal/handler/BoxHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
*/
package org.openhab.binding.avmfritz.internal.handler;

import java.util.HashSet;
import static org.openhab.binding.avmfritz.internal.AVMFritzBindingConstants.*;

import java.util.Set;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
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.callmonitor.CallMonitor;
import org.openhab.binding.avmfritz.internal.config.AVMFritzBoxConfiguration;
Expand All @@ -38,14 +38,8 @@
@NonNullByDefault
public class BoxHandler extends AVMFritzBaseBridgeHandler {

protected static final Set<String> CALL_CHANNELS = new HashSet<>();
static {
// 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 static final Set<String> CALL_CHANNELS = Set.of(CHANNEL_CALL_ACTIVE, CHANNEL_CALL_INCOMING,
CHANNEL_CALL_OUTGOING, CHANNEL_CALL_STATE);

private @Nullable CallMonitor callMonitor;

Expand Down