Эх сурвалжийг харах

More progress on external signaling

Mario Danic 6 жил өмнө
parent
commit
ca632be2ac

+ 27 - 0
app/src/main/java/com/nextcloud/talk/api/ExternalSignaling.java

@@ -20,12 +20,25 @@
 
 
 package com.nextcloud.talk.api;
 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.WebSocket;
 import com.tinder.scarlet.ws.Receive;
 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;
 import io.reactivex.Flowable;
 
 
 public interface ExternalSignaling {
 public interface ExternalSignaling {
+    @Receive
+    Flowable<WebSocket.Event.OnMessageReceived> observeOnMessageReceived();
+
     @Receive
     @Receive
     Flowable<WebSocket.Event.OnConnectionOpened> observeOnConnectionOpenedEvent();
     Flowable<WebSocket.Event.OnConnectionOpened> observeOnConnectionOpenedEvent();
 
 
@@ -35,4 +48,18 @@ public interface ExternalSignaling {
     @Receive
     @Receive
     Flowable<WebSocket.Event.OnConnectionClosed> observeOnConnectionClosedEvent();
     Flowable<WebSocket.Event.OnConnectionClosed> observeOnConnectionClosedEvent();
 
 
+    @Send
+    void sendHello(HelloOverallWebSocketMessage helloOverallWebSocketMessage);
+
+    @Send
+    void sendResumeHello(RoomOverallWebSocketMessage roomOverallWebSocketMessage);
+
+    @Send
+    void sendOfferRequest(RequestOfferOverallWebSocketMessage requestOfferOverallWebSocketMessage);
+
+    @Send
+    void sendCallMessage(CallOverallWebSocketMessage callOverallWebSocketMessage);
+
+    @Receive
+    Flowable<HelloResponseWebSocketMessage> observeOnHelloBackEvent();
 }
 }

+ 48 - 0
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 <mario@lovelyhq.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+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;
+    }
+}

+ 38 - 0
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 <mario@lovelyhq.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+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<String> features;
+}