mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Detect duplicates when finding servers.

Browse Source 
Change-Id: Ie922e1f930df7987f77c153474aece2668250293
This commit is contained in:
Andrzej J.R. Hunt
2012-08-03 14:18:41 +02:00
committed by Michael Meeks
parent bbbfaf7b9e
commit ad72b47df4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java
View File

@@ -6,7 +6,7 @@ import java.net.DatagramPacket;
import java.net.DatagramSocket; import java.net.DatagramSocket;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.SocketException; import java.net.SocketException;
import java.util.Vector; import java.util.HashMap;
import org.libreoffice.impressremote.communication.CommunicationService.Server; import org.libreoffice.impressremote.communication.CommunicationService.Server;
@@ -27,7 +27,7 @@ public class ServerFinder {
private boolean mFinishRequested = false; private boolean mFinishRequested = false;
private Vector<Server> mServerList = new Vector<Server>(); private HashMap<String, Server> mServerList = new HashMap<String, Server>();
public ServerFinder(Context aContext) { public ServerFinder(Context aContext) {
mContext = aContext; mContext = aContext;
@@ -65,7 +65,7 @@ public class ServerFinder {
Server aServer = new Server(CommunicationService.Protocol.NETWORK, Server aServer = new Server(CommunicationService.Protocol.NETWORK,
aPacket.getAddress().toString(), aName, aPacket.getAddress().toString(), aName,
System.currentTimeMillis()); System.currentTimeMillis());
mServerList.add(aServer); mServerList.put(aServer.getAddress(), aServer);
// System.out.println("SF FOUND: IP=" // System.out.println("SF FOUND: IP="
// + aPacket.getAddress().toString() + " HOSTNAME=" // + aPacket.getAddress().toString() + " HOSTNAME="
@@ -135,6 +135,6 @@ public class ServerFinder {
} }
public Server[] getServerList() { public Server[] getServerList() {
return mServerList.toArray(new Server[mServerList.size()]); return mServerList.entrySet().toArray(new Server[mServerList.size()]);
} }
} }