Skip to content

Commit 4c07488

Browse files
[Android] Fix resolve exception issue (#35551)
* Fix Android resolve exception issue * Restyled by google-java-format --------- Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 36fff94 commit 4c07488

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

src/platform/android/java/chip/platform/NsdServiceFinderAndResolver.java

+11-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ class NsdServiceFinderAndResolver implements NsdManager.DiscoveryListener {
4141
private final ChipMdnsCallback chipMdnsCallback;
4242
private final MulticastLock multicastLock;
4343
private final ScheduledFuture<?> resolveTimeoutExecutor;
44+
private NsdServiceInfo discoveredServiceInfo = null;
4445

4546
@Nullable
4647
private final NsdManagerServiceResolver.NsdManagerResolverAvailState nsdManagerResolverAvailState;
@@ -94,14 +95,14 @@ public void run() {
9495

9596
@Override
9697
public void onServiceFound(NsdServiceInfo service) {
97-
if (targetServiceInfo.getServiceName().equals(service.getServiceName())) {
98+
if (discoveredServiceInfo == null
99+
&& targetServiceInfo.getServiceName().equals(service.getServiceName())) {
98100
Log.d(TAG, "onServiceFound: found target service " + service);
99101

100102
if (stopDiscoveryRunnable.cancel(false)) {
101103
nsdManager.stopServiceDiscovery(this);
102104
}
103-
104-
resolveService(service, callbackHandle, contextHandle, chipMdnsCallback);
105+
discoveredServiceInfo = service;
105106
} else {
106107
Log.d(TAG, "onServiceFound: found service not a target for resolution, ignoring " + service);
107108
}
@@ -206,7 +207,13 @@ public void onServiceLost(NsdServiceInfo service) {
206207

207208
@Override
208209
public void onDiscoveryStopped(String serviceType) {
209-
Log.i(TAG, "Discovery stopped: " + serviceType);
210+
Log.i(
211+
TAG,
212+
"Discovery stopped: " + serviceType + ", discoveredServiceInfo: " + discoveredServiceInfo);
213+
if (discoveredServiceInfo != null) {
214+
resolveService(discoveredServiceInfo, callbackHandle, contextHandle, chipMdnsCallback);
215+
discoveredServiceInfo = null;
216+
}
210217
}
211218

212219
@Override

0 commit comments

Comments
 (0)