Skip to content

Null-guard Configuration.locale in MessageBuilder #299

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
adalpari wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Null-guard Configuration.locale in MessageBuilder #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion AutomatticTracks/src/main/java/com/automattic/android/tracks/MessageBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,11 @@ public static synchronized JSONObject createRequestCommonPropsJSONObject(Context
}

try {
commonProps.put(USER_LANG_KEY, ctx.getResources().getConfiguration().locale.toString());
// Locale can be transiently null on some Samsung devices during a locale change.
Locale locale = ctx.getResources().getConfiguration().locale;
if (locale != null) {
commonProps.put(USER_LANG_KEY, locale.toString());
}
} catch (JSONException e) {
Log.e(TracksClient.LOGTAG, "Cannot add the device language property to request commons.");
}
Expand Down
Loading