|
1 | 1 | package com.onesignal;
|
2 | 2 |
|
| 3 | +import androidx.annotation.NonNull; |
| 4 | + |
3 | 5 | import org.json.JSONException;
|
4 | 6 | import org.json.JSONObject;
|
5 | 7 |
|
@@ -92,7 +94,7 @@ public JSONObject getSyncValuesCopy() throws JSONException {
|
92 | 94 | }
|
93 | 95 | }
|
94 | 96 |
|
95 |
| - public void setSyncValues(JSONObject syncValues) { |
| 97 | + public void setSyncValues(@NonNull JSONObject syncValues) { |
96 | 98 | synchronized (LOCK) {
|
97 | 99 | this.syncValues = syncValues;
|
98 | 100 | }
|
@@ -297,21 +299,20 @@ private void loadState() {
|
297 | 299 |
|
298 | 300 | String syncValuesStr = OneSignalPrefs.getString(OneSignalPrefs.PREFS_ONESIGNAL,
|
299 | 301 | OneSignalPrefs.PREFS_ONESIGNAL_USERSTATE_SYNCVALYES_ + persistKey,null);
|
| 302 | + |
| 303 | + JSONObject syncValues = new JSONObject(); |
300 | 304 | try {
|
301 |
| - JSONObject syncValues; |
302 | 305 | if (syncValuesStr == null) {
|
303 |
| - syncValues = new JSONObject(); |
304 |
| - String gtRegistrationId = OneSignalPrefs.getString(OneSignalPrefs.PREFS_ONESIGNAL, |
| 306 | + String registrationId = OneSignalPrefs.getString(OneSignalPrefs.PREFS_ONESIGNAL, |
305 | 307 | OneSignalPrefs.PREFS_GT_REGISTRATION_ID,null);
|
306 |
| - syncValues.put("identifier", gtRegistrationId); |
| 308 | + syncValues.put("identifier", registrationId); |
307 | 309 | } else {
|
308 | 310 | syncValues = new JSONObject(syncValuesStr);
|
309 | 311 | }
|
310 |
| - |
311 |
| - setSyncValues(syncValues); |
312 | 312 | } catch (JSONException e) {
|
313 | 313 | e.printStackTrace();
|
314 | 314 | }
|
| 315 | + setSyncValues(syncValues); |
315 | 316 | }
|
316 | 317 |
|
317 | 318 | void persistState() {
|
|
0 commit comments