tv-casting-app/android: resetting discovery state vars onStartDiscove…

…ryFailed (#29836)
project-chip · Oct 18, 2023 · 6b64a80 · 6b64a80
1 parent 836ceec
commit 6b64a80
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/...es/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java b/...es/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/NsdDiscoveryListener.java
@@ -109,6 +109,7 @@ public void onDiscoveryStopped(String serviceType) {
   @Override
   public void onStartDiscoveryFailed(String serviceType, int errorCode) {
     Log.e(TAG, "Discovery failed to start: Error code:" + errorCode);
+    TvCastingApp.getInstance().resetDiscoveryState();
     failureCallback.handle(
         new MatterError(
             3, "NsdDiscoveryListener Discovery failed to start: Nsd Error code:" + errorCode));

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
@@ -297,6 +297,17 @@ public void stopVideoPlayerDiscovery() {
     }
   }
 
+  void resetDiscoveryState() {
+    synchronized (discoveryLock) {
+      Log.d(TAG, "TvCastingApp resetting discovery state");
+      this.discoveryStarted = false;
+      this.nsdDiscoveryListener = null;
+      if (multicastLock != null && multicastLock.isHeld()) {
+        multicastLock.release();
+      }
+    }
+  }
+
   public native boolean openBasicCommissioningWindow(
       int duration,
       CommissioningCallbacks commissioningCallbacks,