Skip to content

Fix null EventProperties.getType() on Android (initialize eventType) #1483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmehta001 wants to merge 3 commits into
base: main
Choose a base branch
from
+25 −2
Open

Fix null EventProperties.getType() on Android (initialize eventType) #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8842c12
android: initialize EventPropertiesStorage.eventType to fix null getT…
bmehta001 Jun 12, 2026
a332db7
Don't forward an empty event type to native SetType (Android)
bmehta001 Jun 13, 2026
43b5be8
Address Copilot on #1483: test EventPropertiesStorage directly (no na…
bmehta001 Jun 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ..._build/maesdk/src/main/java/com/microsoft/applications/events/EventPropertiesStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class EventPropertiesStorage {

EventPropertiesStorage() {
eventName = "";
eventType = "";
eventLatency = EventLatency.Normal;
eventPersistence = EventPersistence.Normal;
eventPopSample = 100;
Expand Down
13 changes: 13 additions & 0 deletions lib/android_build/maesdk/src/test/java/com/microsoft/applications/events/EventsUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,17 @@ public void requestException() throws java.io.IOException, PackageManager.NameNo
}
}

@Test
public void newEventPropertiesStorageEventTypeDefaultsToEmptyString() {
// Regression test for #1329: EventPropertiesStorage previously left
// eventType uninitialized (null), so EventProperties.getType() (which
// returns mStorage.eventType) returned null instead of its documented
// "" default. Exercise the pure-Java storage directly: constructing an
// EventProperties here would call setName() -> native validateEventName(),
// which is not loaded in these JVM (MockitoJUnitRunner) unit tests.
EventPropertiesStorage storage = new EventPropertiesStorage();
assertNotNull(storage.eventType);
assertEquals("", storage.eventType);
}

}
13 changes: 11 additions & 2 deletions lib/jni/JniConvertors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,17 @@ EventProperties GetEventProperties(JNIEnv* env, const jstring& jstrEventName, co
const jobjectArray& jEventPropertyStringKeyArray, const jobjectArray& jEventPropertyValueArray) {
EventProperties eventProperties;
eventProperties.SetName(JStringToStdString(env, jstrEventName));
if (jstrEventType != NULL)
eventProperties.SetType(JStringToStdString(env, jstrEventType));
if (jstrEventType != NULL) {
// An empty type means "unset" (the native default). Before #1329 the
// Java getType() returned null for a default EventProperties, so this
// branch was skipped. getType() now returns "" to fix a Java-side NPE;
// forwarding SetType("") here would fail native event-name validation
// and broadcast a spurious EVT_REJECTED for every typeless event, so
// only set a non-empty type.
std::string eventType = JStringToStdString(env, jstrEventType);
if (!eventType.empty())
eventProperties.SetType(eventType);
}
eventProperties.SetLatency(static_cast<EventLatency>(jEventLatency));
eventProperties.SetPersistence(static_cast<EventPersistence>(jEventPersistence));
eventProperties.SetPopsample(static_cast<double>(jEventPopSample));
Expand Down
Loading