Skip to content

Commit 40b58d9

Browse files
committed
Refactored single use of remove to a write
* This lets us clean up a non-optimized code path
1 parent 15801ba commit 40b58d9

2 files changed

Lines changed: 3 additions & 18 deletions

File tree

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

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private static Object get(String prefsName, String key, Class type, Object defVa
194194
return true;
195195

196196
Object cachedValue = pref.get(key);
197-
if (cachedValue != null)
197+
if (cachedValue != null || pref.containsKey(key))
198198
return cachedValue;
199199
}
200200

@@ -217,22 +217,6 @@ else if (type.equals(Object.class))
217217
return defValue;
218218
}
219219

220-
// TODO: Removes could be optimized as well.
221-
// running applying here for safely for now.
222-
static void remove(String prefsName, String key) {
223-
HashMap<String, Object> pref = prefsToApply.get(prefsName);
224-
synchronized (pref) {
225-
pref.remove(key);
226-
}
227-
228-
SharedPreferences prefs = getSharedPrefsByName(prefsName);
229-
if (prefs != null) {
230-
SharedPreferences.Editor editor = prefs.edit();
231-
editor.remove(key);
232-
editor.apply();
233-
}
234-
}
235-
236220
private static synchronized SharedPreferences getSharedPrefsByName(String prefsName) {
237221
if (OneSignal.appContext == null)
238222
return null;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ public void onSuccess(String response) {
231231

232232
OneSignalPrefs.saveString(OneSignalPrefs.PREFS_PLAYER_PURCHASES,
233233
OneSignalPrefs.PREFS_PURCHASE_TOKENS, purchaseTokens.toString());
234-
OneSignalPrefs.remove(OneSignalPrefs.PREFS_PLAYER_PURCHASES, OneSignalPrefs.PREFS_EXISTING_PURCHASES);
234+
OneSignalPrefs.saveBool(OneSignalPrefs.PREFS_PLAYER_PURCHASES,
235+
OneSignalPrefs.PREFS_EXISTING_PURCHASES, true);
235236

236237
newAsExisting = false;
237238
isWaitingForPurchasesRequest = false;

0 commit comments

Comments
 (0)