(fix)UPS: don't trim unless over 100 experiments in user's UPS (#248)

* don't trim user profile service unless it has gotten to over 100 experiments. (#244)

* update changelog

* fix changelog

Author: thomaszurkan-optimizely

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Optimizely Android X SDK Changelog
 
+## 2.1.4
+Feburary 8th, 2019
+
+This is a patch release.
+
+### Bug Fixes
+* Fix for User Profile Service.  Don't trim the user profile service unless there are over 100 experiments in a users UPS. This will be configurable in the future.
+
 ## 2.1.3
 December 6th, 2018
 

user-profile/src/main/java/com/optimizely/ab/android/user_profile/UserProfileCache.java

@@ -185,11 +185,14 @@ public void removeInvalidExperiments(Set<String> validExperimentIds) {
             Map<String, Object> maps = memoryCache.get(userId);
             Map<String, Map<String, String>> experimentBucketMap =
                     (ConcurrentHashMap<String, Map<String, String>>) maps.get(experimentBucketMapKey);
-            for (String experimentId : experimentBucketMap.keySet()){
-                if (!validExperimentIds.contains(experimentId)) {
-                    experimentBucketMap.remove(experimentId);
+            if (experimentBucketMap != null && experimentBucketMap.keySet().size() > 100) {
+                for (String experimentId : experimentBucketMap.keySet()) {
+                    if (!validExperimentIds.contains(experimentId)) {
+                        experimentBucketMap.remove(experimentId);
+                    }
                 }
             }
+
         }
         diskCache.save(memoryCache);
     }