From 6389a9ec724865f30c34d1217bc8b12d685f7080 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Thu, 29 Sep 2022 10:50:24 +0200
Subject: [PATCH] openvidu-android: remove TODOs after 2.23.0

---
 .../openvidu_android/openvidu/Session.java    | 62 -------------------
 .../websocket/CustomWebSocket.java            | 16 -----
 2 files changed, 78 deletions(-)

diff --git a/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java
index 544b132e..a9305ee5 100644
--- a/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java
+++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/openvidu/Session.java
@@ -79,28 +79,6 @@ public class Session {
     }
 
     public PeerConnection createLocalPeerConnection() {
-        // TODO: start block to remove after 2.23
-        do {
-            if (iceServers.isEmpty()) {
-                if (iceServerUri != null) {
-                    IceServer.Builder iceServerBuilder;
-                    try {
-                        iceServerBuilder = IceServer.builder(iceServerUri);
-                    } catch (IllegalArgumentException e) {
-                        break;
-                    }
-                    if (iceServerUser != null) {
-                        iceServerBuilder.setUsername(iceServerUser);
-                    }
-                    if (iceServerPass != null) {
-                        iceServerBuilder.setPassword(iceServerPass);
-                    }
-                    iceServers.add(iceServerBuilder.createIceServer());
-                }
-            }
-        } while (false);
-        // TODO: end block to remove after 2.23
-
         PeerConnection.RTCConfiguration config =
                 new PeerConnection.RTCConfiguration(iceServers.isEmpty()
                         ? iceServersDefault
@@ -148,28 +126,6 @@ public class Session {
     }
 
     public void createRemotePeerConnection(final String connectionId) {
-        // TODO: start block to remove after 2.23
-        do {
-            if (iceServers.isEmpty()) {
-                if (iceServerUri != null) {
-                    IceServer.Builder iceServerBuilder;
-                    try {
-                        iceServerBuilder = IceServer.builder(iceServerUri);
-                    } catch (IllegalArgumentException e) {
-                        break;
-                    }
-                    if (iceServerUser != null) {
-                        iceServerBuilder.setUsername(iceServerUser);
-                    }
-                    if (iceServerPass != null) {
-                        iceServerBuilder.setPassword(iceServerPass);
-                    }
-                    iceServers.add(iceServerBuilder.createIceServer());
-                }
-            }
-        } while (false);
-        // TODO: end block to remove after 2.23
-
         PeerConnection.RTCConfiguration config =
                 new PeerConnection.RTCConfiguration(iceServers.isEmpty()
                         ? iceServersDefault
@@ -261,24 +217,6 @@ public class Session {
         return this.token;
     }
 
-    // TODO: start block to remove after 2.23
-    private String iceServerUri = null;
-    private String iceServerUser = null;
-    private String iceServerPass = null;
-
-    public void setIceServerUri(String uri) {
-        iceServerUri = uri;
-    }
-
-    public void setIceServerUser(String user) {
-        iceServerUser = user;
-    }
-
-    public void setIceServerPass(String pass) {
-        iceServerPass = pass;
-    }
-    // TODO: end block to remove after 2.23
-
     public void setIceServers(List<IceServer> iceServers) {
         this.iceServers = iceServers;
     }
diff --git a/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java
index 09a11583..8b224548 100644
--- a/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java
+++ b/openvidu-android/app/src/main/java/io/openvidu/openvidu_android/websocket/CustomWebSocket.java
@@ -164,22 +164,6 @@ public class CustomWebSocket extends AsyncTask<SessionActivity, Void, Void> impl
                 session.setIceServers(iceServers);
             }
 
-            // TODO: start block to remove after 2.23
-            if (result.has("coturnIp") && result.has("coturnPort")) {
-                final String turnHost = result.getString("coturnIp");
-                final String turnPort = result.getString("coturnPort");
-                session.setIceServerUri("turn:" + turnHost + ":" + turnPort);
-            }
-            if (result.has("turnUsername")) {
-                final String turnUser = result.getString("turnUsername");
-                session.setIceServerUser(turnUser);
-            }
-            if (result.has("turnCredential")) {
-                final String turnPass = result.getString("turnCredential");
-                session.setIceServerPass(turnPass);
-            }
-            // TODO: end block to remove after 2.23
-
             PeerConnection localPeerConnection = session.createLocalPeerConnection();
 
             localParticipant.setPeerConnection(localPeerConnection);