Added code to test ContentLauncher

sharadb-amazon · sharadb-amazon · commit 633888ea71e4 · 2024-02-29T10:02:51.000-08:00
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ContentLauncherLaunchURLExampleFragment.java b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ContentLauncherLaunchURLExampleFragment.java
@@ -140,7 +140,7 @@ public View onCreateView(
                     return null;
                   });*/
 
-            //endpoint.testGetCluster();
+            endpoint.testGetCluster();
         };
 
     return inflater.inflate(R.layout.fragment_content_launcher, container, false);
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/Endpoint.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/Endpoint.java
@@ -35,6 +35,6 @@ public interface Endpoint {
 
   boolean hasCluster(Class<? extends Cluster> clusterClass);
 
-  //void testGetCluster();
+  void testGetCluster();
 
 }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterCastingPlayerDiscovery.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterCastingPlayerDiscovery.java
@@ -33,21 +33,10 @@ public final class MatterCastingPlayerDiscovery implements CastingPlayerDiscover
   private static final String TAG = MatterCastingPlayerDiscovery.class.getSimpleName();
   private static MatterCastingPlayerDiscovery matterCastingPlayerDiscoveryInstance;
 
-  // Methods:
   public static MatterCastingPlayerDiscovery getInstance() {
     if (matterCastingPlayerDiscoveryInstance == null) {
       matterCastingPlayerDiscoveryInstance = new MatterCastingPlayerDiscovery();
     }
-
-    try
-    {
-      ChipDeviceController c = new ChipDeviceController(null);
-    }
-    catch(Throwable t)
-    {
-      Log.d(TAG, "Caught: " + t);
-    }
-
     return matterCastingPlayerDiscoveryInstance;
   };
 
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterEndpoint.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/matter/casting/core/MatterEndpoint.java
@@ -24,11 +24,15 @@
 import com.matter.casting.support.SuccessCallback;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import chip.devicecontroller.ChipClusters;
+import chip.devicecontroller.ChipStructs;
+
 public class MatterEndpoint implements Endpoint {
   private static final String TAG = MatterEndpoint.class.getSimpleName();
   protected long _cppEndpoint;
@@ -53,6 +57,7 @@ public class MatterEndpoint implements Endpoint {
   protected CompletableFuture<Long> getDeviceProxy()
   {
     CompletableFuture<Long> future = new CompletableFuture<>();
+
     getDeviceProxy(new SuccessCallback<Long>() {
       @Override
       public void handle(Long deviceProxyPtr) {
@@ -86,6 +91,23 @@ public void testGetCluster()
     try {
       Long deviceProxy = deviceProxyFuture.get(5, TimeUnit.SECONDS);
       Log.d(TAG, "getDeviceProxy returned value " + deviceProxy);
+      ChipClusters.ContentLauncherCluster cluster = new ChipClusters.ContentLauncherCluster(deviceProxy, getId());
+      cluster.launchURL(new ChipClusters.ContentLauncherCluster.LauncherResponseCallback() {
+        @Override
+        public void onSuccess(Integer status, Optional<String> data) {
+          Log.d(TAG, "Content launcher success " + status + data);
+        }
+
+        @Override
+        public void onError(Exception error) {
+          Log.e(TAG, "Content launcher failure " + error);
+        }
+      }
+      ,"my test url",
+              Optional.of("my display str"),
+              Optional.empty()
+      );
+
     } catch (ExecutionException | InterruptedException | TimeoutException e) {
       Log.e(TAG, "getDeviceProxy exception" + e);
     }
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.cpp
@@ -87,13 +87,20 @@ JNI_METHOD(jobject, getCastingPlayer)
 }
 
 JNI_METHOD(void, getDeviceProxy)
-(JNIEnv * env, jobject thiz, jobject callbackHandle)
+(JNIEnv * env, jobject thiz, jobject jSuccessHandler, jobject jFailureHandler)
 {
     chip::DeviceLayer::StackLock lock;
     ChipLogProgress(AppServer, "MatterEndpoint-JNI::getDeviceProxy() called");
     Endpoint * endpoint = support::convertEndpointFromJavaToCpp(thiz);
     VerifyOrReturn(endpoint != nullptr, ChipLogError(AppServer, "MatterEndpoint-JNI::getDeviceProxy() endpoint == nullptr"));
 
+    SessionContextJNI * context         = new SessionContextJNI();
+    context->successHandler = jSuccessHandler;
+    context->failureHandler = jFailureHandler;
+
+    DeviceProxyMatterSuccessHandlerJNI successHandler;
+    successHandler.SetUp(env, jSuccessHandler);
+
     /*chip::Controller::GetConnectedDeviceCallback * connectedDeviceCallback = reinterpret_cast<chip::Controller::GetConnectedDeviceCallback *>(callbackHandle);
 
     chip::NodeId nodeId = endpoint->GetCastingPlayer()->GetNodeId();
@@ -102,39 +109,30 @@ JNI_METHOD(void, getDeviceProxy)
         chip::ScopedNodeId(endpoint->GetCastingPlayer()->GetNodeId(), endpoint->GetCastingPlayer()->GetFabricIndex()), &connectedDeviceCallback->mOnSuccess, &connectedDeviceCallback->mOnFailure);*/
 
     //endpoint->GetCastingPlayer()->FindOrEstablishSession(&nodeId, &connectedDeviceCallback->mOnSuccess, &connectedDeviceCallback->mOnFailure);
-/*                    
+    endpoint->GetCastingPlayer()->FindOrEstablishSession(context,
                     [](void * context, chip::Messaging::ExchangeManager & exchangeMgr, const chip::SessionHandle & sessionHandle) {
                         ChipLogProgress(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() success");
-                        GetConnectedDeviceCallback * connectedDeviceCallback = static_cast<GetConnectedDeviceCallback *>(context);
-    
-                        SessionContextJNI * __context = static_cast<SessionContextJNI *>(context);
-
                         JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
-                        //chip::DeviceLayer::StackUnlock unlock;
                         OperationalDeviceProxy * device = new OperationalDeviceProxy(&exchangeMgr, sessionHandle);
-                        ChipLogProgress(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() before CallBooleanMethod");
-                        jclass completableFutureClass = env->GetObjectClass(__context->completableFuture);
-                        jmethodID getMethod = env->GetMethodID(completableFutureClass, "complete", "(Ljava/lang/Object;)Z");
+                        SessionContextJNI * _context = static_cast<SessionContextJNI *>(context);                
 
-                        env->CallBooleanMethod(__context->completableFuture, getMethod, device);     
-                        ChipLogProgress(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() after CallBooleanMethod");
+                        DeviceProxyMatterSuccessHandlerJNI successHandler;
+                        successHandler.SetUp(env, _context->successHandler);
+                        successHandler.Handle(reinterpret_cast<jlong>(device));
                     },
                     [](void * context, const chip::ScopedNodeId & peerId, CHIP_ERROR error) {
                         ChipLogError(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() failure");
-                        SessionContextJNI * __context = static_cast<SessionContextJNI *>(context);
-
                         JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
                         jstring errorMessage = env->NewStringUTF(error.Format());
                         VerifyOrReturn(errorMessage != nullptr,
                                ChipLogError(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() Could not create errorMessage"));
                         jobject throwableObject = env->NewObject(MatterEndpointJNIMgr().mThrowableClass, MatterEndpointJNIMgr().mThrowableConstructor, errorMessage);
                         VerifyOrReturn(throwableObject != nullptr,
-                               ChipLogError(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() Could not create throwableObject"));*/
+                               ChipLogError(AppServer, "MatterEndpointJNI::FindOrEstablishSessionTask() Could not create throwableObject"));
 
-                        //chip::DeviceLayer::StackUnlock unlock;
- /*                       env->CallBooleanMethod(__context->completableFuture, MatterEndpointJNIMgr().mCompleteExceptionallyMethod, throwableObject);
+                        SessionContextJNI * __context = static_cast<SessionContextJNI *>(context);
                     });
-*/
+
     /*MatterEndpointJNIMgr().Init();
     // Setup completableFuture
     jobject completableFuture = env->NewGlobalRef(env->NewObject(MatterEndpointJNIMgr().mCompletableFutureClass, MatterEndpointJNIMgr().mCompletableFutureConstructor));
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.h b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterEndpoint-JNI.h
@@ -31,8 +31,8 @@ namespace core {
 struct SessionContextJNI
 {
 public:
-    Endpoint *endpoint;
-    jobject completableFuture;
+    jobject successHandler;
+    jobject failureHandler;
 };
 
 class MatterEndpointJNI
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/MatterCallback-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/MatterCallback-JNI.cpp
@@ -26,13 +26,13 @@ CHIP_ERROR MatterCallbackBaseJNI::SetUp(JNIEnv * env, jobject inHandler)
     mObject = env->NewGlobalRef(inHandler);
     VerifyOrExit(mObject != nullptr, ChipLogError(AppServer, "Failed to NewGlobalRef for handler object"));
 
-    mClazz = env->GetObjectClass(mObject);
+    mClazz = env->GetObjectClass(inHandler);
     VerifyOrExit(mClazz != nullptr, ChipLogError(AppServer, "Failed to get handler Java class"));
 
     mSuperClazz = env->GetSuperclass(mClazz);
     VerifyOrExit(mSuperClazz != nullptr, ChipLogError(AppServer, "Failed to get handler's parent's Java class"));
 
-    mMethod = env->GetMethodID(mSuperClazz, "handleInternal", mMethodSignature);
+    mMethod = env->GetMethodID(mClazz, "handleInternal", mMethodSignature);
     if (mMethod == nullptr)
     {
         ChipLogError(AppServer, "Failed to access 'handleInternal' method with signature %s", mMethodSignature);
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/MatterCallback-JNI.h b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/support/MatterCallback-JNI.h
@@ -47,7 +47,7 @@ template <typename T>
 class MatterSuccessHandlerJNI : public MatterCallbackBaseJNI
 {
 public:
-    MatterSuccessHandlerJNI(const char * methodSignature) : MatterCallbackBaseJNI(methodSignature) {}
+    MatterSuccessHandlerJNI() : MatterCallbackBaseJNI("(Ljava/lang/Object;)V") {}
 
     virtual ~MatterSuccessHandlerJNI() = 0;
 
@@ -76,10 +76,8 @@ class MatterSuccessHandlerJNI : public MatterCallbackBaseJNI
 template <typename T>
 MatterSuccessHandlerJNI<T>::~MatterSuccessHandlerJNI(){};
 
-class DeviceProxyMatterSuccessHandlerJNI
-    : public MatterSuccessHandlerJNI<jlong>
+class DeviceProxyMatterSuccessHandlerJNI: public MatterSuccessHandlerJNI<jlong>
 {
 public:
-    DeviceProxyMatterSuccessHandlerJNI() : MatterSuccessHandlerJNI("(Ljava/lang/Long;)V") {}
     jobject ConvertToJObject(jlong responseData);
 };

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public interface Endpoint {`
`35`	`35`
`36`	`36`	`boolean hasCluster(Class<? extends Cluster> clusterClass);`
`37`	`37`
`38`		`- //void testGetCluster();`
	`38`	`+ void testGetCluster();`
`39`	`39`
`40`	`40`	`}`