From acd69e6e36b2fccd3dcd0e73e336377ae17dabee Mon Sep 17 00:00:00 2001 From: fmarasco Date: Tue, 26 Aug 2025 09:00:29 -0400 Subject: [PATCH 1/4] fix sanitizer android --- lib/android_build/maesdk/src/main/cpp/CMakeLists.txt | 2 ++ lib/jni/SanitizerHelper.hpp | 2 +- lib/jni/Sanitizer_jni.cpp | 7 +++---- lib/modules | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt b/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt index cb70849b6..0aac79475 100644 --- a/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt +++ b/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt @@ -160,6 +160,8 @@ target_include_directories(${TARGETNAME} PUBLIC ${SDK_ROOT}/sqlite ${SDK_ROOT}lib/pal ${SDK_ROOT} + ${SDK_ROOT}/lib/modules/sanitizer/detectors + ${SDK_ROOT}/lib/modules/sanitizer ${CURL_INCLUDE_DIRS}) diff --git a/lib/jni/SanitizerHelper.hpp b/lib/jni/SanitizerHelper.hpp index a2308fcad..1c6e5f463 100644 --- a/lib/jni/SanitizerHelper.hpp +++ b/lib/jni/SanitizerHelper.hpp @@ -8,7 +8,7 @@ namespace MAT_NS_BEGIN { - struct Sanitizer { + struct SanitizerHelper { /** * Get the current instance of Sanitizer. * @return SanitizerPtr if it is initialized, nullptr otherwise. diff --git a/lib/jni/Sanitizer_jni.cpp b/lib/jni/Sanitizer_jni.cpp index 8f2d7c847..be7046eb9 100644 --- a/lib/jni/Sanitizer_jni.cpp +++ b/lib/jni/Sanitizer_jni.cpp @@ -3,7 +3,6 @@ // SPDX-License-Identifier: Apache-2.0 // -#include "ctmacros.hpp" #include "JniConvertors.hpp" #include "modules/sanitizer/Sanitizer.hpp" #include "SanitizerHelper.hpp" @@ -38,10 +37,10 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize( SanitizerConfiguration sanitizerConfig(reinterpret_cast(iLoggerNativePtr)); if (notificationEventName != nullptr) { - config.NotificationEventName = JStringToStdString(env, notificationEventName).c_str(); + sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str(); } - spSanitizer = std::make_shared(config); + spSanitizer = std::make_shared(sanitizerConfig); return true; } @@ -78,6 +77,6 @@ Java_com_microsoft_applications_events_Sanitizer_setEnabled(JNIEnv *env, jclass return false; } - spDataInspector->SetEnabled(static_cast(enabled)); + spSanitizer->SetEnabled(static_cast(enabled)); return true; } \ No newline at end of file diff --git a/lib/modules b/lib/modules index bd40008a9..9b536f939 160000 --- a/lib/modules +++ b/lib/modules @@ -1 +1 @@ -Subproject commit bd40008a920f419c70c56fc5eed0f1f3e16fe58f +Subproject commit 9b536f9393ab58560a96ec216173f91d2c7f819c From 0ad13a09a5668a0264599b4efe1ed722c71b6a9e Mon Sep 17 00:00:00 2001 From: FrankM ODSP Date: Tue, 26 Aug 2025 09:07:17 -0400 Subject: [PATCH 2/4] Update lib/jni/Sanitizer_jni.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/jni/Sanitizer_jni.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jni/Sanitizer_jni.cpp b/lib/jni/Sanitizer_jni.cpp index be7046eb9..d93173372 100644 --- a/lib/jni/Sanitizer_jni.cpp +++ b/lib/jni/Sanitizer_jni.cpp @@ -37,7 +37,7 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize( SanitizerConfiguration sanitizerConfig(reinterpret_cast(iLoggerNativePtr)); if (notificationEventName != nullptr) { - sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str(); + sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName); } spSanitizer = std::make_shared(sanitizerConfig); From 77d3f9c04a572942147be4ea862b76de98ffdd01 Mon Sep 17 00:00:00 2001 From: fmarasco Date: Tue, 26 Aug 2025 09:12:58 -0400 Subject: [PATCH 3/4] fixed isEnabled --- lib/jni/Sanitizer_jni.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jni/Sanitizer_jni.cpp b/lib/jni/Sanitizer_jni.cpp index d93173372..85ccddd69 100644 --- a/lib/jni/Sanitizer_jni.cpp +++ b/lib/jni/Sanitizer_jni.cpp @@ -73,7 +73,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_microsoft_applications_events_Sanitizer_setEnabled(JNIEnv *env, jclass clazz, jboolean enabled) { - if (spDataInspector == nullptr) { + if (spSanitizer == nullptr) { return false; } From 2936c87b0233135a2275a832187d4cd5ee9b4032 Mon Sep 17 00:00:00 2001 From: fmarasco Date: Tue, 26 Aug 2025 09:16:17 -0400 Subject: [PATCH 4/4] revert copilot change --- lib/jni/Sanitizer_jni.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jni/Sanitizer_jni.cpp b/lib/jni/Sanitizer_jni.cpp index 85ccddd69..830b072ab 100644 --- a/lib/jni/Sanitizer_jni.cpp +++ b/lib/jni/Sanitizer_jni.cpp @@ -37,7 +37,7 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize( SanitizerConfiguration sanitizerConfig(reinterpret_cast(iLoggerNativePtr)); if (notificationEventName != nullptr) { - sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName); + sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str(); } spSanitizer = std::make_shared(sanitizerConfig);