Skip to content

fix(Android): Report correct port, even when automatically allocated #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2020
Merged

fix(Android): Report correct port, even when automatically allocated #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19028bd
Report the correct port on Android, even when automatically allocated.
eddieAnthem Oct 2, 2020
1ba372f
Remove the unneeded listeningPort field.
eddieAnthem Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void run() {
try {
TcpSocketServer server = new TcpSocketServer(socketClients, TcpSocketModule.this, cId, options);
socketClients.put(cId, server);
int port = options.getInt("port");
int port = server.getListeningPort();
String host = options.getString("host");
onConnect(cId, host, port);
} catch (Exception uhe) {
Expand Down
5 changes: 5 additions & 0 deletions android/src/main/java/com/asterinet/react/tcpsocket/TcpSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public TcpSocketServer(final ConcurrentHashMap<Integer, TcpSocketClient> socketC
InetAddress localInetAddress = InetAddress.getByName(address);
// Create the socket
serverSocket = new ServerSocket(port, 50, localInetAddress);

// setReuseAddress
try {
boolean reuseAddress = options.getBoolean("reuseAddress");
Expand Down Expand Up @@ -103,4 +104,8 @@ public void close() {
mReceiverListener.onClose(getId(), e.getMessage());
}
}

public int getListeningPort() {
return (serverSocket == null) ? -1 : serverSocket.getLocalPort();
}
}