From 6c342331587c2ddebbee7b02795aa2cb39d6555a Mon Sep 17 00:00:00 2001
From: Philip Gregor <pgregorr@amazon.com>
Date: Wed, 7 Aug 2024 10:41:35 -0700
Subject: [PATCH] Addressed comments by sharadb-amazon

---
 .../casting/ConnectionExampleFragment.java    | 32 -------------------
 .../fragment_matter_connection_example.xml    |  7 ----
 .../core/CastingPlayerDiscovery.cpp           | 28 ++++++----------
 .../core/CastingPlayerDiscovery.h             |  7 ----
 4 files changed, 10 insertions(+), 64 deletions(-)

diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java
index 3e0ea69d8d82ec..5db9a3560749b5 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ConnectionExampleFragment.java
@@ -31,8 +31,6 @@
 import androidx.fragment.app.Fragment;
 import com.R;
 import com.matter.casting.core.CastingPlayer;
-import com.matter.casting.core.CastingPlayerDiscovery;
-import com.matter.casting.core.MatterCastingPlayerDiscovery;
 import com.matter.casting.support.CommissionerDeclaration;
 import com.matter.casting.support.ConnectionCallbacks;
 import com.matter.casting.support.IdentificationDeclarationOptions;
@@ -58,11 +56,6 @@ public class ConnectionExampleFragment extends Fragment {
   private TextView connectionFragmentStatusTextView;
   private Button connectionFragmentNextButton;
 
-  // Get a singleton instance of the MatterCastingPlayerDiscovery. Which can be used to call
-  // stopDiscovery() during connection.
-  static final CastingPlayerDiscovery matterCastingPlayerDiscovery =
-      MatterCastingPlayerDiscovery.getInstance();
-
   public ConnectionExampleFragment(
       CastingPlayer targetCastingPlayer, boolean useCommissionerGeneratedPasscode) {
     Log.i(
@@ -130,13 +123,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
           callback.handleConnectionComplete(targetCastingPlayer, useCommissionerGeneratedPasscode);
         });
 
-    Button stopDiscoveryButton = getView().findViewById(R.id.stopDiscoveryButton);
-    stopDiscoveryButton.setOnClickListener(
-        v -> {
-          Log.i(TAG, "onViewCreated() stopDiscoveryButton button clicked. Calling stopDiscovery()");
-          stopDiscovery();
-        });
-
     Executors.newSingleThreadExecutor()
         .submit(
             () -> {
@@ -369,24 +355,6 @@ public void onClick(DialogInterface dialog, int which) {
         .setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
   }
 
-  private void stopDiscovery() {
-    Log.i(
-        TAG,
-        "ConnectionExampleFragment stopDiscovery() called, calling MatterCastingPlayerDiscovery.stopDiscovery()");
-
-    MatterError err = matterCastingPlayerDiscovery.stopDiscovery();
-    if (err.hasError()) {
-      Log.e(
-          TAG,
-          "ConnectionExampleFragment stopDiscovery() MatterCastingPlayerDiscovery.stopDiscovery() called, err Stop: "
-              + err);
-    } else {
-      Log.d(
-          TAG,
-          "ConnectionExampleFragment stopDiscovery() MatterCastingPlayerDiscovery.stopDiscovery() success");
-    }
-  }
-
   /** Interface for notifying the host. */
   public interface Callback {
     /** Notifies listener to trigger transition on completion of connection */
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_matter_connection_example.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_matter_connection_example.xml
index 0bf14095abdfc8..9c2cf867326175 100644
--- a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_matter_connection_example.xml
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_matter_connection_example.xml
@@ -29,13 +29,6 @@
             android:layout_height="wrap_content"
             android:text="@string/matter_connection_next_button_text" />
 
-        <Button
-            android:enabled="true"
-            android:id="@+id/stopDiscoveryButton"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/matter_stop_discovery_button_text" />
-
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
index 34018a06f90886..307bcb4167e980 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.cpp
@@ -68,12 +68,9 @@ CHIP_ERROR CastingPlayerDiscovery::StopDiscovery()
     VerifyOrReturnError(mState == DISCOVERY_RUNNING, CHIP_ERROR_INCORRECT_STATE);
     ReturnErrorOnFailure(mCommissionableNodeController.StopDiscovery());
 
-    // Clear mCastingPlayersInternal of disconnected CastingPlayers
-    ClearDisconnectedCastingPlayersInternal();
-    for (const auto & player : mCastingPlayers)
-    {
-        mCastingPlayersInternal.push_back(player);
-    }
+    // Copy mCastingPlayers to mCastingPlayersInternal
+    mCastingPlayersInternal = std::vector<memory::Strong<CastingPlayer>>(mCastingPlayers);
+
     // Clear mCastingPlayers of all CastingPlayers
     mCastingPlayers.clear();
     mState = DISCOVERY_READY;
@@ -86,22 +83,17 @@ void CastingPlayerDiscovery::ClearDisconnectedCastingPlayersInternal()
     ChipLogProgress(Discovery, "CastingPlayerDiscovery::ClearDisconnectedCastingPlayersInternal() mCastingPlayersInternal: %lu",
                     mCastingPlayersInternal.size());
     // Only clear the CastingPlayers in mCastingPlayersInternal with ConnectionState == CASTING_PLAYER_NOT_CONNECTED
-    ClearDisconnectedCastingPlayers(mCastingPlayersInternal);
-}
-
-void CastingPlayerDiscovery::ClearDisconnectedCastingPlayers(std::vector<std::shared_ptr<CastingPlayer>> & castingPlayers)
-{
-    ChipLogProgress(Discovery, "CastingPlayerDiscovery::ClearDisconnectedCastingPlayers() called");
-    for (auto it = castingPlayers.begin(); it != castingPlayers.end();)
+    for (auto it = mCastingPlayersInternal.begin(); it != mCastingPlayersInternal.end();)
     {
         auto & player = *it;
         if (player->GetConnectionState() == CASTING_PLAYER_NOT_CONNECTED)
         {
-            ChipLogProgress(Discovery,
-                            "CastingPlayerDiscovery::ClearDisconnectedCastingPlayers() Removing disconnected CastingPlayer: %s "
-                            "with reference count: %lu",
-                            player->GetDeviceName(), player.use_count());
-            it = castingPlayers.erase(it);
+            ChipLogProgress(
+                Discovery,
+                "CastingPlayerDiscovery::ClearDisconnectedCastingPlayersInternal() Removing disconnected CastingPlayer: %s "
+                "with reference count: %lu",
+                player->GetDeviceName(), player.use_count());
+            it = mCastingPlayersInternal.erase(it);
         }
         else
         {
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h
index a4e349de190b07..3a98472bd8c6d1 100644
--- a/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h
+++ b/examples/tv-casting-app/tv-casting-common/core/CastingPlayerDiscovery.h
@@ -99,13 +99,6 @@ class CastingPlayerDiscovery
      */
     void ClearDisconnectedCastingPlayersInternal();
 
-    /**
-     * @brief Clear CastingPlayers in the specified vector with ConnectionState == CASTING_PLAYER_NOT_CONNECTED
-     *
-     * @param castingPlayers vector of CastingPlayers to clear
-     */
-    void ClearDisconnectedCastingPlayers(std::vector<std::shared_ptr<CastingPlayer>> & castingPlayers);
-
     /**
      * @brief Clear all CastingPlayers in mCastingPlayersInternal
      */