From 21cd4f5958056c90a72289a7fefd725caa5a7815 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 5 May 2022 14:37:52 -0400 Subject: [PATCH 1/2] jni: fix mismatched return value types The Java side expects an `int` return value: https://github.com/envoyproxy/envoy-mobile/blob/c930fec015c363e2a6db56f93635beddba19fa5f/library/java/io/envoyproxy/envoymobile/engine/JniLibrary.java#L323 Signed-off-by: JP Simard --- library/common/jni/jni_interface.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/common/jni/jni_interface.cc b/library/common/jni/jni_interface.cc index 72a2399183..9d998221a2 100644 --- a/library/common/jni/jni_interface.cc +++ b/library/common/jni/jni_interface.cc @@ -1015,12 +1015,12 @@ Java_io_envoyproxy_envoymobile_engine_JniLibrary_registerStringAccessor(JNIEnv* return result; } -extern "C" JNIEXPORT void JNICALL +extern "C" JNIEXPORT int JNICALL Java_io_envoyproxy_envoymobile_engine_JniLibrary_resetConnectivityState(JNIEnv* env, jclass, // class jlong engine) { jni_log("[Envoy]", "resetConnectivityState"); - reset_connectivity_state(engine); + return reset_connectivity_state(engine); } extern "C" JNIEXPORT jint JNICALL From 263213b1c0e170847d15436a51357dc5c295b1db Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 5 May 2022 14:44:15 -0400 Subject: [PATCH 2/2] int -> jint Signed-off-by: JP Simard --- library/common/jni/jni_interface.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/common/jni/jni_interface.cc b/library/common/jni/jni_interface.cc index 9d998221a2..811087dac6 100644 --- a/library/common/jni/jni_interface.cc +++ b/library/common/jni/jni_interface.cc @@ -1015,7 +1015,7 @@ Java_io_envoyproxy_envoymobile_engine_JniLibrary_registerStringAccessor(JNIEnv* return result; } -extern "C" JNIEXPORT int JNICALL +extern "C" JNIEXPORT jint JNICALL Java_io_envoyproxy_envoymobile_engine_JniLibrary_resetConnectivityState(JNIEnv* env, jclass, // class jlong engine) {