Try to retrace DSM7 changes

- event handling
- Auth API version

Author: Pavion

src/main/java/org/openhab/binding/synologysurveillancestation/internal/thread/SynoApiThreadEvent.java

@@ -62,16 +62,17 @@ public boolean isNeeded() {
     @Override
     public boolean refresh() throws Exception {
         SynoCameraHandler cameraHandler = getSynoHandler();
+        // Thing thing = cameraHandler.getThing();
 
-        for (String eventType : events.keySet()) {
-            if (getSynoHandler().isLinked(eventType)) {
-                Channel channel = cameraHandler.getThing().getChannel(eventType);
-                SynoEvent event = events.get(eventType);
-                EventResponse response = cameraHandler.getSynoWebApiHandler().getApiEvent()
-                        .getEventResponse(cameraHandler.getCameraId(), lastEventTime, event.getReason());
-                if (response.isSuccess()) {
-                    if (!response.isEmpty()) {
-                        SynoEvent responseEvent = response.getFirst();
+        EventResponse response = cameraHandler.getSynoWebApiHandler().getApiEvent()
+                .getEventResponse(cameraHandler.getCameraId(), lastEventTime, events);
+        if (response.isSuccess()) {
+            for (String eventType : events.keySet()) {
+                if (getSynoHandler().isLinked(eventType)) {
+                    SynoEvent event = events.get(eventType);
+                    Channel channel = cameraHandler.getThing().getChannel(eventType);
+                    if (response.hasEvent(event.getReason())) {
+                        SynoEvent responseEvent = response.getEvent(event.getReason());
                         if (responseEvent.getEventId() != event.getEventId()) {
                             event.setEventId(responseEvent.getEventId());
                             event.setEventCompleted(responseEvent.isEventCompleted());
@@ -88,17 +89,16 @@ public boolean refresh() throws Exception {
                         event.setEventCompleted(true);
                         cameraHandler.updateState(channel.getUID(), OnOffType.OFF);
                     }
-                    if (response.getTimestamp() > lastEventTime) {
-                        lastEventTime = response.getTimestamp();
-                    }
-                } else if (response.getErrorcode() == 105) {
-                    throw new WebApiException(WebApiAuthErrorCodes.INSUFFICIENT_USER_PRIVILEGE);
-                } else {
-                    return false;
                 }
             }
+
+            lastEventTime = response.getTimestamp();
+            return true;
+        } else if (response.getErrorcode() == 105) {
+            throw new WebApiException(WebApiAuthErrorCodes.INSUFFICIENT_USER_PRIVILEGE);
+        } else {
+            return false;
         }
-        return true;
     }
 
     /**

src/main/java/org/openhab/binding/synologysurveillancestation/internal/webapi/request/SynoApiAuth.java

@@ -40,7 +40,7 @@ public class SynoApiAuth extends SynoApiRequest<AuthResponse> {
 
     // API configuration
     private static final String API_NAME = "SYNO.API.Auth";
-    private static final SynoApiConfig API_CONFIG = new SynoApiConfig(API_NAME, API_VERSION_06, API_SCRIPT_AUTH);
+    private static final SynoApiConfig API_CONFIG = new SynoApiConfig(API_NAME, API_VERSION_02, API_SCRIPT_AUTH);
 
     /**
      * @param config

src/main/java/org/openhab/binding/synologysurveillancestation/internal/webapi/request/SynoApiEvent.java

@@ -14,10 +14,12 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.StringJoiner;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jetty.client.HttpClient;
 import org.openhab.binding.synologysurveillancestation.internal.SynoConfig;
+import org.openhab.binding.synologysurveillancestation.internal.webapi.SynoEvent;
 import org.openhab.binding.synologysurveillancestation.internal.webapi.WebApiException;
 import org.openhab.binding.synologysurveillancestation.internal.webapi.response.EventResponse;
 
@@ -48,14 +50,19 @@ public SynoApiEvent(SynoConfig config, HttpClient httpClient) {
      * @return
      * @throws WebApiException
      */
-    public EventResponse getEventResponse(String cameraId, long lastEventTime, int reason) {
+    public EventResponse getEventResponse(String cameraId, long lastEventTime, Map<String, SynoEvent> events) {
         Map<String, String> params = new HashMap<>();
 
         params.put("cameraIds", cameraId);
-        // params.put("fromTime", String.valueOf(lastEventTime));
+        params.put("fromTime", String.valueOf(lastEventTime));
         params.put("blIncludeSnapshot", API_FALSE);
-        params.put("limit", "1");
-        params.put("reason", String.valueOf(reason));
+        params.put("limit", "25");
+
+        StringJoiner reasons = new StringJoiner(",");
+        for (SynoEvent event : events.values()) {
+            reasons.add(String.valueOf(event.getReason()));
+        }
+        params.put("reason", reasons.toString());
 
         try {
             return callApi(METHOD_LIST, params);