Android/tv-casting-app: Fix for issue in finding handleInternal() on …

…some Android phones (#165) (#26757)
project-chip · Nov 7, 2023 · 1221179 · 1221179
1 parent e31ea35
commit 1221179
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/FailureCallback.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/FailureCallback.java
@@ -24,7 +24,7 @@ public abstract class FailureCallback {
 
   public abstract void handle(MatterError err);
 
-  private final void handleInternal(int errorCode, String errorMessage) {
+  protected final void handleInternal(int errorCode, String errorMessage) {
     try {
       handle(new MatterError(errorCode, errorMessage));
     } catch (Throwable t) {

diff --git a/...s/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterCallbackHandler.java b/...s/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/MatterCallbackHandler.java
@@ -24,7 +24,7 @@ public abstract class MatterCallbackHandler {
 
   public abstract void handle(MatterError err);
 
-  private final void handleInternal(int errorCode, String errorMessage) {
+  protected final void handleInternal(int errorCode, String errorMessage) {
     try {
       handle(new MatterError(errorCode, errorMessage));
     } catch (Throwable t) {

diff --git a/...ng-app/android/App/app/src/main/jni/com/chip/casting/SubscriptionEstablishedCallback.java b/...ng-app/android/App/app/src/main/jni/com/chip/casting/SubscriptionEstablishedCallback.java
@@ -24,7 +24,7 @@ public abstract class SubscriptionEstablishedCallback {
 
   public abstract void handle();
 
-  private void handleInternal() {
+  protected void handleInternal() {
     try {
       handle();
     } catch (Throwable t) {

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/SuccessCallback.java b/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/SuccessCallback.java
@@ -24,7 +24,7 @@ public abstract class SuccessCallback<R> {
 
   public abstract void handle(R response);
 
-  public void handleInternal(R response) {
+  protected final void handleInternal(R response) {
     try {
       handle(response);
     } catch (Throwable t) {

diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.cpp
@@ -31,7 +31,10 @@ CHIP_ERROR CallbackBaseJNI::SetUp(JNIEnv * env, jobject inHandler)
     mClazz = env->GetObjectClass(mObject);
     VerifyOrExit(mClazz != nullptr, ChipLogError(AppServer, "Failed to get handler Java class"));
 
-    mMethod = env->GetMethodID(mClazz, "handleInternal", mMethodSignature);
+    mSuperClazz = env->GetSuperclass(mClazz);
+    VerifyOrExit(mSuperClazz != nullptr, ChipLogError(AppServer, "Failed to get handler's parent's Java class"));
+
+    mMethod = env->GetMethodID(mSuperClazz, "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/MatterCallbackHandler-JNI.h b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/MatterCallbackHandler-JNI.h
@@ -37,6 +37,7 @@ class CallbackBaseJNI
 protected:
     jobject mObject               = nullptr;
     jclass mClazz                 = nullptr;
+    jclass mSuperClazz            = nullptr;
     jmethodID mMethod             = nullptr;
     const char * mMethodSignature = nullptr;
 };