Skip to content

Commit af7620e

Browse files
committed
Fixed NPE when setLocationShared is called before init
* Also added shareLocation check in registerUser
1 parent d7ad1d1 commit af7620e

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ public void run() {
790790
userState.set("carrier", osUtils.getCarrierName());
791791
userState.set("rooted", RootToolsInternalMethods.isRooted());
792792

793-
if (lastLocationPoint != null)
793+
if (shareLocation && lastLocationPoint != null)
794794
userState.setLocation(lastLocationPoint);
795795

796796
OneSignalStateSynchronizer.postUpdate(userState, sendAsSession);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,9 @@ static boolean stopAndPersist() {
226226
}
227227

228228
static void clearLocation() {
229+
if (appContext == null)
230+
return;
231+
229232
getToSyncUserState().clearLocation();
230233
getToSyncUserState().persistState();
231234
}

0 commit comments

Comments
 (0)