From 6a09b369444dbba673f8b43b316648e68d1f096a Mon Sep 17 00:00:00 2001 From: Jeff Lockhart Date: Sat, 30 May 2020 17:27:45 -0600 Subject: [PATCH] Fix crash from constant data missing ID data --- .../java/com/google/i18n/addressinput/common/CacheData.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java b/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java index 24f5c833..d8c2155f 100644 --- a/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java +++ b/common/src/main/java/com/google/i18n/addressinput/common/CacheData.java @@ -338,7 +338,11 @@ void getFromRegionDataConstants(final LookupKey key) { key.getValueForUpperLevelField(AddressField.COUNTRY)); if (data != null) { try { - cache.putObj(key.toString(), JsoMap.buildJsoMap(data)); + JsoMap obj = JsoMap.buildJsoMap(data); + String id = Util.toLowerCaseLocaleIndependent(AddressDataKey.ID.toString()); + String keyString = key.toString(); + obj.put(id, keyString); + cache.putObj(keyString, obj); } catch (JSONException e) { logger.warning("Failed to parse data for key " + key + " from RegionDataConstants"); }