Skip to content

Commit 057cdd9

Browse files
authored
Changed OSUtils.<String>newConcurrentSet() default to null (#1048)
* The default should not have been set to `OSUtils.<String>newConcurrentSet()`, this caused a `NPE` * Correct usage is `OSUtils.newConcurrentSet()` and this is not an acceptable default * Return type of `OSUtils.newConcurrentSet()` is Set<T> and forcing to `<String>` will cause the NPE in some cases
1 parent 2be8e02 commit 057cdd9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalCacheCleaner.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,12 +184,12 @@ private static void cleanInAppMessageIds(Set<String> oldMessageIds) {
184184
Set<String> dismissedMessages = OneSignalPrefs.getStringSet(
185185
OneSignalPrefs.PREFS_ONESIGNAL,
186186
OneSignalPrefs.PREFS_OS_DISMISSED_IAMS,
187-
OSUtils.<String>newConcurrentSet());
187+
null);
188188

189189
Set<String> impressionedMessages = OneSignalPrefs.getStringSet(
190190
OneSignalPrefs.PREFS_ONESIGNAL,
191191
OneSignalPrefs.PREFS_OS_IMPRESSIONED_IAMS,
192-
OSUtils.<String>newConcurrentSet());
192+
null);
193193

194194
if (dismissedMessages != null && dismissedMessages.size() > 0) {
195195
dismissedMessages.removeAll(oldMessageIds);
@@ -222,7 +222,7 @@ private static void cleanInAppMessageClickedClickIds(Set<String> oldClickedClick
222222
Set<String> clickedClickIds = OneSignalPrefs.getStringSet(
223223
OneSignalPrefs.PREFS_ONESIGNAL,
224224
OneSignalPrefs.PREFS_OS_CLICKED_CLICK_IDS_IAMS,
225-
OSUtils.<String>newConcurrentSet());
225+
null);
226226

227227
if (clickedClickIds != null && clickedClickIds.size() > 0) {
228228
clickedClickIds.removeAll(oldClickedClickIds);

OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalPrefs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static Object getObject(String prefsName, String key, Object defValue) {
286286
}
287287

288288
SharedPreferences prefs = getSharedPrefsByName(prefsName);
289-
if (prefs != null ) {
289+
if (prefs != null) {
290290
if (type.equals(String.class))
291291
return prefs.getString(key, (String)defValue);
292292
else if (type.equals(Boolean.class))

0 commit comments

Comments
 (0)