Skip to content
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

Jump to bottom

Fix the crash in DevX tracking in debugging mode #797

Merged
merged 3 commits into from
Aug 5, 2022
Merged

Fix the crash in DevX tracking in debugging mode #797

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
01327c5
Update master with next snasphot version 6.5.2-SNAPSHOT
zihejia Jul 26, 2022
a2a74b6
Merge branch 'master' of github.com:mixpanel/mixpanel-android
zihejia Jul 26, 2022
4934099
fix the crash in DevX tracking in debugging mode
zihejia Aug 4, 2022
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION_NAME=6.5.1
VERSION_NAME=6.5.2-SNAPSHOT

POM_PACKAGING=aar
GROUP=com.mixpanel.android
Expand Down
4 changes: 3 additions & 1 deletion src/androidTest/java/com/mixpanel/android/mpmetrics/MixpanelBasicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,8 +298,10 @@ protected AnalyticsMessages getAnalyticsMessages() {
}
}



@Test
public void testPeopleOperations() throws JSONException {
public void testPeopleMessageOperations() throws JSONException {
final List<AnalyticsMessages.PeopleDescription> messages = new ArrayList<AnalyticsMessages.PeopleDescription>();

final AnalyticsMessages listener = new AnalyticsMessages(InstrumentationRegistry.getInstrumentation().getContext()) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/mixpanel/android/mpmetrics/MixpanelAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,7 +2111,8 @@ private JSONObject stdPeopleMessage(String actionType, Object properties)
dataObj.put("$mp_metadata", mSessionMetadata.getMetadataForPeople());

if (((getContext().getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0)) {
if (properties instanceof JSONObject && !((JSONObject) properties).keys().next().startsWith("$ae_")) {
if (properties instanceof JSONObject && ((JSONObject) properties).keys().hasNext()
&& !((JSONObject) properties).keys().next().startsWith("$ae_")) {
mPersistentIdentity.setHasMPDebugUsedPeople(mToken);
}
}
Expand Down