From ca632be2ac216c56016ad096e7e7f57d4e9e55ac Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 11 Oct 2018 12:37:51 +0200 Subject: [PATCH] More progress on external signaling --- .../nextcloud/talk/api/ExternalSignaling.java | 27 +++++++++++ .../HelloResponseWebSocketMessage.java | 48 +++++++++++++++++++ ...HelloResponseFeaturesWebSocketMessage.java | 38 +++++++++++++++ 3 files changed, 113 insertions(+) create mode 100644 app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java create mode 100644 app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java diff --git a/app/src/main/java/com/nextcloud/talk/api/ExternalSignaling.java b/app/src/main/java/com/nextcloud/talk/api/ExternalSignaling.java index 351fec7c2..860fa894b 100644 --- a/app/src/main/java/com/nextcloud/talk/api/ExternalSignaling.java +++ b/app/src/main/java/com/nextcloud/talk/api/ExternalSignaling.java @@ -20,12 +20,25 @@ package com.nextcloud.talk.api; +import com.nextcloud.talk.models.json.websocket.CallOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.HelloOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.HelloResponseWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.RequestOfferOverallWebSocketMessage; +import com.nextcloud.talk.models.json.websocket.RoomOverallWebSocketMessage; import com.tinder.scarlet.WebSocket; import com.tinder.scarlet.ws.Receive; +import com.tinder.scarlet.ws.Send; + +import org.intellij.lang.annotations.Flow; + +import java.util.HashMap; import io.reactivex.Flowable; public interface ExternalSignaling { + @Receive + Flowable observeOnMessageReceived(); + @Receive Flowable observeOnConnectionOpenedEvent(); @@ -35,4 +48,18 @@ public interface ExternalSignaling { @Receive Flowable observeOnConnectionClosedEvent(); + @Send + void sendHello(HelloOverallWebSocketMessage helloOverallWebSocketMessage); + + @Send + void sendResumeHello(RoomOverallWebSocketMessage roomOverallWebSocketMessage); + + @Send + void sendOfferRequest(RequestOfferOverallWebSocketMessage requestOfferOverallWebSocketMessage); + + @Send + void sendCallMessage(CallOverallWebSocketMessage callOverallWebSocketMessage); + + @Receive + Flowable observeOnHelloBackEvent(); } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java new file mode 100644 index 000000000..19fc0923c --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.java @@ -0,0 +1,48 @@ +/* + * Nextcloud Talk application + * + * @author Mario Danic + * Copyright (C) 2017-2018 Mario Danic + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.nextcloud.talk.models.json.websocket; + +import com.bluelinelabs.logansquare.annotation.JsonField; +import com.bluelinelabs.logansquare.annotation.JsonObject; + +import org.parceler.Parcel; + +import lombok.Data; + +@Data +@JsonObject +@Parcel +public class HelloResponseWebSocketMessage { + @JsonField(name = "resumeid") + String resumeId; + + @JsonField(name = "server") + ServerHelloResponseFeaturesWebSocketMessage serverHelloResponseFeaturesWebSocketMessage; + + public boolean serverHasMCUSupport() { + if (serverHelloResponseFeaturesWebSocketMessage != null && serverHelloResponseFeaturesWebSocketMessage.getFeatures() != null + && serverHelloResponseFeaturesWebSocketMessage.getFeatures().contains("mcu")) { + return true; + } + + return false; + } +} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java new file mode 100644 index 000000000..c4406211d --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.java @@ -0,0 +1,38 @@ +/* + * Nextcloud Talk application + * + * @author Mario Danic + * Copyright (C) 2017-2018 Mario Danic + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.nextcloud.talk.models.json.websocket; + +import com.bluelinelabs.logansquare.annotation.JsonField; +import com.bluelinelabs.logansquare.annotation.JsonObject; + +import org.parceler.Parcel; + +import java.util.List; + +import lombok.Data; + +@JsonObject +@Parcel +@Data +public class ServerHelloResponseFeaturesWebSocketMessage { + @JsonField(name = "features") + List features; +}