From 0828bc6f128383d33efd7b1f7c2da6cc0bc8d3f6 Mon Sep 17 00:00:00 2001
From: pabloFuente <pablofuenteperez@gmail.com>
Date: Wed, 5 Sep 2018 17:04:05 +0200
Subject: [PATCH] openvidu-java-client: Connection.location and
 Connection.platform support

---
 .../io/openvidu/java/client/Connection.java   | 23 ++++++++++++++++++-
 .../java/io/openvidu/java/client/Session.java |  4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/Connection.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Connection.java
index 0b6e1765..380c1aff 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/Connection.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Connection.java
@@ -29,17 +29,21 @@ public class Connection {
 	private String connectionId;
 	private OpenViduRole role;
 	private String token;
+	private String location;
+	private String platform;
 	private String serverData;
 	private String clientData;
 
 	protected Map<String, Publisher> publishers;
 	protected List<String> subscribers;
 
-	protected Connection(String connectionId, OpenViduRole role, String token, String serverData, String clientData,
+	protected Connection(String connectionId, OpenViduRole role, String token, String location, String platform, String serverData, String clientData,
 			Map<String, Publisher> publishers, List<String> subscribers) {
 		this.connectionId = connectionId;
 		this.role = role;
 		this.token = token;
+		this.location = location;
+		this.platform = platform;
 		this.serverData = serverData;
 		this.clientData = clientData;
 		this.publishers = publishers;
@@ -69,6 +73,23 @@ public class Connection {
 		return token;
 	}
 
+	/**
+	 * Returns the geo location of the connection, with the following format:
+	 * <code>"CITY, COUNTRY"</code> (<code>"unknown"</code> if it wasn't possible to
+	 * locate it)
+	 */
+	public String getLocation() {
+		return location;
+	}
+
+	/**
+	 * Returns a complete description of the platform used by the participant to
+	 * connect to the session
+	 */
+	public String getPlatform() {
+		return platform;
+	}
+
 	/**
 	 * Returns the data associated to the connection on the server-side. This value
 	 * is set with {@link io.openvidu.java.client.TokenOptions.Builder#data(String)}
diff --git a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
index 59adca5d..ec956286 100644
--- a/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
+++ b/openvidu-java-client/src/main/java/io/openvidu/java/client/Session.java
@@ -529,8 +529,8 @@ public class Session {
 
 			this.activeConnections.put((String) con.get("connectionId"),
 					new Connection((String) con.get("connectionId"), OpenViduRole.valueOf((String) con.get("role")),
-							(String) con.get("token"), (String) con.get("serverData"), (String) con.get("clientData"),
-							publishers, subscribers));
+							(String) con.get("token"), (String) con.get("location"), (String) con.get("platform"),
+							(String) con.get("serverData"), (String) con.get("clientData"), publishers, subscribers));
 		});
 		return this;
 	}