From 00a6fcf478185594396c02e788dd7fabf7425a01 Mon Sep 17 00:00:00 2001
From: Sharad Binjola <31142146+sharadb-amazon@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:45:25 -0700
Subject: [PATCH] tv-casting-app: Allow for a way for Matter TV casting cache
 to be purged (#25665)

* tv-casting-app: Allow for a way for Matter TV casting cache to be purged (#112)

* tv-casting-app: Adding a way to purge cached video players

* Android tv-casting-app: Adding purge cache button

* iOS tv-casting-app: Adding purge cache button

* Addressing feedback from Cliff
---
 .../app/CommissionerDiscoveryFragment.java      | 17 +++++++++++++++++
 .../main/jni/com/chip/casting/TvCastingApp.java |  2 ++
 .../app/src/main/jni/cpp/TvCastingApp-JNI.cpp   | 14 ++++++++++++++
 .../layout/fragment_commissioner_discovery.xml  |  6 ++++++
 .../MatterTvCastingBridge/CastingServerBridge.h | 11 ++++++++++-
 .../CastingServerBridge.mm                      | 11 +++++++++++
 .../TvCasting/StartFromCacheView.swift          |  9 +++++++++
 .../TvCasting/StartFromCacheViewModel.swift     | 12 ++++++++++++
 .../tv-casting-common/include/CastingServer.h   |  2 +-
 .../tv-casting-common/src/CastingServer.cpp     |  2 +-
 .../src/PersistenceManager.cpp                  |  8 +++++++-
 11 files changed, 90 insertions(+), 4 deletions(-)

diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
index 0f0529a6c70cfa..dbb95e88806a92 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/CommissionerDiscoveryFragment.java
@@ -11,6 +11,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ListView;
+import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import com.chip.casting.DiscoveredNodeData;
@@ -77,6 +78,22 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         v -> callback.handleCommissioningButtonClicked(null);
     manualCommissioningButton.setOnClickListener(manualCommissioningButtonOnClickListener);
 
+    Button purgeCacheButton = getView().findViewById(R.id.purgeCacheButton);
+    Context context = getContext().getApplicationContext();
+    View.OnClickListener purgeCacheOnClickListener =
+        new View.OnClickListener() {
+          @Override
+          public void onClick(View v) {
+            boolean status = tvCastingApp.purgeCache();
+            Toast.makeText(
+                    context,
+                    "Cache purge " + (status ? "successful!" : "failed!"),
+                    Toast.LENGTH_SHORT)
+                .show();
+          }
+        };
+    purgeCacheButton.setOnClickListener(purgeCacheOnClickListener);
+
     ArrayAdapter<DiscoveredNodeData> arrayAdapter =
         new VideoPlayerCommissionerAdapter(getActivity(), commissionerVideoPlayerList);
     final ListView list = getActivity().findViewById(R.id.commissionerList);
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
index 316edf3ba26357..b44d8e2b1c2119 100644
--- 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
@@ -181,6 +181,8 @@ public native boolean verifyOrEstablishConnection(
 
   public native List<VideoPlayer> getActiveTargetVideoPlayers();
 
+  public native boolean purgeCache();
+
   /*
    * CONTENT LAUNCHER CLUSTER
    *
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
index eb584e2589bd5b..77d6c5e0e40fc1 100644
--- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
+++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp
@@ -303,6 +303,20 @@ JNI_METHOD(jboolean, sendCommissioningRequest)(JNIEnv * env, jobject, jobject jD
     return true;
 }
 
+JNI_METHOD(jboolean, purgeCache)(JNIEnv * env, jobject)
+{
+    chip::DeviceLayer::StackLock lock;
+    ChipLogProgress(AppServer, "JNI_METHOD purgeCache called");
+
+    CHIP_ERROR err = CastingServer::GetInstance()->PurgeCache();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(AppServer, "TVCastingApp-JNI::purgeCache failed: %" CHIP_ERROR_FORMAT, err.Format());
+        return false;
+    }
+    return true;
+}
+
 JNI_METHOD(jboolean, contentLauncherLaunchURL)
 (JNIEnv * env, jobject, jobject contentApp, jstring contentUrl, jstring contentDisplayStr, jobject jResponseHandler)
 {
diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
index 7cfdf23b0b335b..85855dbff4e5a9 100644
--- a/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
+++ b/examples/tv-casting-app/android/App/app/src/main/res/layout/fragment_commissioner_discovery.xml
@@ -14,6 +14,12 @@
         tools:layout_editor_absoluteY="1dp"
         android:padding="10sp">
 
+        <Button
+            android:id="@+id/purgeCacheButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Purge Cache" />
+
         <Button
             android:id="@+id/manualCommissioningButton"
             android:layout_width="match_parent"
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.h b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.h
index 0a8fa240e6e1c1..234a92f905023f 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.h
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.h
@@ -185,7 +185,16 @@
  */
 - (void)disconnect:(dispatch_queue_t _Nonnull)clientQueue requestSentHandler:(nullable void (^)())requestSentHandler;
 
-/**
+/*!
+ @brief Purge data cached by the Matter casting library
+
+ @param clientQueue Queue to invoke callbacks on
+
+ @param responseHandler Called when purgeCache completes
+ */
+- (void)purgeCache:(dispatch_queue_t _Nonnull)clientQueue responseHandler:(void (^)(MatterError * _Nonnull))responseHandler;
+
+/*!
  @brief Start the Matter server and reconnect to a previously connected Video Player (if any). This API is async
 
  @param clientQueue Queue to invoke callbacks on
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
index 28c20b1747b502..a665bb3d24f29d 100644
--- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
+++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm
@@ -665,6 +665,17 @@ - (void)disconnect:(dispatch_queue_t _Nonnull)clientQueue requestSentHandler:(nu
     });
 }
 
+- (void)purgeCache:(dispatch_queue_t _Nonnull)clientQueue responseHandler:(void (^)(MatterError * _Nonnull))responseHandler
+{
+    dispatch_sync(_chipWorkQueue, ^{
+        CHIP_ERROR err = CastingServer::GetInstance()->PurgeCache();
+        dispatch_async(clientQueue, ^{
+            responseHandler([[MatterError alloc] initWithCode:err.AsInteger()
+                                                      message:[NSString stringWithUTF8String:err.AsString()]]);
+        });
+    });
+}
+
 - (void)contentLauncher_launchUrl:(ContentApp * _Nonnull)contentApp
                        contentUrl:(NSString * _Nonnull)contentUrl
                 contentDisplayStr:(NSString * _Nonnull)contentDisplayStr
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheView.swift b/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheView.swift
index 9d4c0c8a659151..0d2bad3e29ba1f 100644
--- a/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheView.swift
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheView.swift
@@ -28,6 +28,15 @@ struct StartFromCacheView: View {
     
     var body: some View {
         VStack(alignment: .leading) {
+            Button("Purge cache", action: {
+                viewModel.purgeAndReReadCache()
+            })
+            .frame(width: 200, height: 30, alignment: .center)
+            .border(Color.black, width: 1)
+            .background(Color.blue)
+            .foregroundColor(Color.white)
+            .padding()
+            
             NavigationLink(
                 destination: CommissionerDiscoveryView(),
                 label: {
diff --git a/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheViewModel.swift b/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheViewModel.swift
index 202d92c5ccfff3..3b12b5fa3c867f 100644
--- a/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheViewModel.swift
+++ b/examples/tv-casting-app/darwin/TvCasting/TvCasting/StartFromCacheViewModel.swift
@@ -35,4 +35,16 @@ class StartFromCacheViewModel: ObservableObject {
             })
         }
     }
+    
+    func purgeAndReReadCache() {
+        if let castingServerBridge = CastingServerBridge.getSharedInstance()
+        {
+            castingServerBridge.purgeCache(DispatchQueue.main, responseHandler: { (error: MatterError) -> () in
+                DispatchQueue.main.async {
+                    self.Log.info("purgeCache returned \(error)")
+                    self.readFromCache()
+                }
+            })
+        }
+    }
 }
diff --git a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
index 3430a4f3bac7f1..b8d61829668206 100644
--- a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
+++ b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h
@@ -98,7 +98,7 @@ class CastingServer
                                            std::function<void(TargetEndpointInfo *)> onNewOrUpdatedEndpoint);
 
     void LogCachedVideoPlayers();
-    CHIP_ERROR PurgeVideoPlayerCache();
+    CHIP_ERROR PurgeCache();
 
     /**
      * Tears down all active subscriptions.
diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
index b6f90d9a8f5451..3a056a36206409 100644
--- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp
@@ -337,7 +337,7 @@ CHIP_ERROR CastingServer::VerifyOrEstablishConnection(TargetVideoPlayerInfo & ta
         onConnectionFailure);
 }
 
-CHIP_ERROR CastingServer::PurgeVideoPlayerCache()
+CHIP_ERROR CastingServer::PurgeCache()
 {
     return mPersistenceManager.PurgeVideoPlayerCache();
 }
diff --git a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
index b5c24ea6f5b9d1..347543c87018cb 100644
--- a/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
+++ b/examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp
@@ -405,5 +405,11 @@ CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVide
 CHIP_ERROR PersistenceManager::PurgeVideoPlayerCache()
 {
     ChipLogProgress(AppServer, "PersistenceManager::PurgeVideoPlayerCache called");
-    return chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Delete(kCastingDataKey);
+    CHIP_ERROR err = chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Delete(kCastingDataKey);
+    if (err == CHIP_ERROR_PERSISTED_STORAGE_VALUE_NOT_FOUND) // no error, if the key-value pair was not stored
+    {
+        ChipLogProgress(AppServer, "PersistenceManager::PurgeVideoPlayerCache ignoring error %" CHIP_ERROR_FORMAT, err.Format());
+        return CHIP_NO_ERROR;
+    }
+    return err;
 }