Skip to content

Commit bae9ba8

Browse files
JeasmineJeasmine
committed
Match OSSubscriptionState and OSPermissionState with OSDeviceState
* Rename properties, getters and setters to match OSDeviceState
1 parent d6f222d commit bae9ba8

File tree

8 files changed

+82
-88
lines changed

8 files changed

+82
-88
lines changed

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/model/MainActivityViewModel.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -303,16 +303,16 @@ public void onOSPermissionChanged(OSPermissionStateChanges stateChanges) {
303303
OneSignal
304304
.getPermissionSubscriptionState()
305305
.getSubscriptionStatus()
306-
.getSubscribed();
306+
.isSubscribed();
307307

308-
boolean isPermissionEnabled = stateChanges.getTo().getEnabled();
308+
boolean isPermissionEnabled = stateChanges.getTo().areNotificationsEnabled();
309309
subscriptionSwitch.setEnabled(isPermissionEnabled);
310310
subscriptionSwitch.setChecked(isSubscribed);
311311
}
312312

313313
@Override
314314
public void onOSSubscriptionChanged(OSSubscriptionStateChanges stateChanges) {
315-
boolean isSubscribed = stateChanges.getTo().getSubscribed();
315+
boolean isSubscribed = stateChanges.getTo().isSubscribed();
316316
subscriptionSwitch.setChecked(isSubscribed);
317317
SharedPreferenceUtil.cacheLocationSharedStatus(context, isSubscribed);
318318
}
@@ -464,14 +464,14 @@ private void setupSubscriptionSwitch() {
464464
OneSignal
465465
.getPermissionSubscriptionState()
466466
.getPermissionStatus()
467-
.getEnabled();
467+
.areNotificationsEnabled();
468468

469469
final boolean isSubscribed = OneSignal
470470
.getPermissionSubscriptionState() != null &&
471471
OneSignal
472472
.getPermissionSubscriptionState()
473473
.getSubscriptionStatus()
474-
.getSubscribed();
474+
.isSubscribed();
475475

476476
subscriptionSwitch.setEnabled(isPermissionEnabled);
477477
subscriptionSwitch.setChecked(isSubscribed);
@@ -480,15 +480,15 @@ private void setupSubscriptionSwitch() {
480480
subscriptionRelativeLayout.setOnClickListener(v -> {
481481
boolean isSubscribed1 = subscriptionSwitch.isChecked();
482482
subscriptionSwitch.setChecked(!isSubscribed1);
483-
OneSignal.disablePush(!isSubscribed1);
483+
OneSignal.disablePush(isSubscribed1);
484484
});
485485
} else {
486486
subscriptionRelativeLayout.setOnClickListener(v -> intentTo.notificationPermissions());
487487
}
488488

489489
subscriptionSwitch.setOnClickListener(v -> {
490490
boolean isSubscribed12 = subscriptionSwitch.isChecked();
491-
OneSignal.disablePush(!isSubscribed12);
491+
OneSignal.disablePush(isSubscribed12);
492492
});
493493
}
494494

‎Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/notification/OneSignalNotificationSender.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
import org.json.JSONException;
1111
import org.json.JSONObject;
1212

13-
import java.util.Random;
14-
1513
public class OneSignalNotificationSender {
1614

1715
public static void sendDeviceNotification(final Notification notification) {
1816
new Thread(() -> {
1917
OSPermissionSubscriptionState status = OneSignal.getPermissionSubscriptionState();
2018
String userId = status.getSubscriptionStatus().getUserId();
21-
boolean isSubscribed = status.getSubscriptionStatus().getSubscribed();
19+
boolean isSubscribed = status.getSubscriptionStatus().isSubscribed();
2220

2321
if (!isSubscribed)
2422
return;

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OSDeviceState.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public OSDeviceState(OSPermissionSubscriptionState permissionSubscriptionState)
4444
OSPermissionState permissionStatus = permissionSubscriptionState.permissionStatus;
4545
OSEmailSubscriptionState emailSubscriptionStatus = permissionSubscriptionState.emailSubscriptionStatus;
4646

47-
areNotificationsEnabled = permissionStatus.getEnabled();
48-
pushDisabled = !subscriptionStatus.getUserSubscriptionSetting();
49-
subscribed = subscriptionStatus.getSubscribed();
47+
areNotificationsEnabled = permissionStatus.areNotificationsEnabled();
48+
pushDisabled = subscriptionStatus.isPushDisabled();
49+
subscribed = subscriptionStatus.isSubscribed();
5050
userId = subscriptionStatus.getUserId();
5151
pushToken = subscriptionStatus.getPushToken();
5252
emailUserId = emailSubscriptionStatus.getEmailUserId();

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OSPermissionChangedInternalObserver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ void changed(OSPermissionState state) {
3434
}
3535

3636
static void handleInternalChanges(OSPermissionState state) {
37-
if (!state.getEnabled())
37+
if (!state.areNotificationsEnabled())
3838
BadgeCountUpdater.updateCount(0, OneSignal.appContext);
3939
OneSignalStateSynchronizer.setPermission(OneSignal.areNotificationsEnabledForSubscribedState());
4040
}

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OSPermissionState.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void refreshAsTo() {
5252
setEnabled(OSUtils.areNotificationsEnabled(OneSignal.appContext));
5353
}
5454

55-
public boolean getEnabled() {
55+
public boolean areNotificationsEnabled() {
5656
return enabled;
5757
}
5858

@@ -83,7 +83,7 @@ public JSONObject toJSONObject() {
8383
JSONObject mainObj = new JSONObject();
8484

8585
try {
86-
mainObj.put("enabled", enabled);
86+
mainObj.put("areNotificationsEnabled", enabled);
8787
}
8888
catch(Throwable t) {
8989
t.printStackTrace();

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OSSubscriptionState.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class OSSubscriptionState implements Cloneable {
4141
observable = new OSObservable<>("changed", false);
4242

4343
if (asFrom) {
44-
userSubscriptionSetting = OneSignalPrefs.getBool(OneSignalPrefs.PREFS_ONESIGNAL,
45-
OneSignalPrefs.PREFS_ONESIGNAL_SUBSCRIPTION_LAST, false);
44+
pushDisabled = OneSignalPrefs.getBool(OneSignalPrefs.PREFS_ONESIGNAL,
45+
OneSignalPrefs.PREFS_ONESIGNAL_SUBSCRIPTION_LAST, true);
4646
userId = OneSignalPrefs.getString(OneSignalPrefs.PREFS_ONESIGNAL,
4747
OneSignalPrefs.PREFS_ONESIGNAL_PLAYER_ID_LAST, null);
4848
pushToken = OneSignalPrefs.getString(OneSignalPrefs.PREFS_ONESIGNAL,
@@ -51,20 +51,20 @@ public class OSSubscriptionState implements Cloneable {
5151
OneSignalPrefs.PREFS_ONESIGNAL_PERMISSION_ACCEPTED_LAST, false);
5252
}
5353
else {
54-
userSubscriptionSetting = OneSignalStateSynchronizer.getUserSubscribePreference();
54+
pushDisabled = !OneSignalStateSynchronizer.getUserSubscribePreference();
5555
userId = OneSignal.getUserId();
5656
pushToken = OneSignalStateSynchronizer.getRegistrationId();
5757
accepted = permissionAccepted;
5858
}
5959
}
6060

6161
private boolean accepted;
62-
private boolean userSubscriptionSetting;
62+
private boolean pushDisabled;
6363
private String userId;
6464
private String pushToken;
6565

6666
void changed(OSPermissionState state) {
67-
setAccepted(state.getEnabled());
67+
setAccepted(state.areNotificationsEnabled());
6868
}
6969

7070
void setUserId(@Nullable String id) {
@@ -96,32 +96,31 @@ public String getPushToken() {
9696
return pushToken;
9797
}
9898

99-
100-
void setUserSubscriptionSetting(boolean set) {
101-
boolean changed = userSubscriptionSetting != set;
102-
userSubscriptionSetting = set;
99+
void setPushDisabled(boolean disabled) {
100+
boolean changed = pushDisabled != disabled;
101+
pushDisabled = disabled;
103102
if (changed)
104103
observable.notifyChange(this);
105104
}
106105

107-
public boolean getUserSubscriptionSetting() {
108-
return userSubscriptionSetting;
106+
public boolean isPushDisabled() {
107+
return pushDisabled;
109108
}
110109

111110
private void setAccepted(boolean set) {
112-
boolean lastSubscribed = getSubscribed();
111+
boolean lastSubscribed = isSubscribed();
113112
accepted = set;
114-
if (lastSubscribed != getSubscribed())
113+
if (lastSubscribed != isSubscribed())
115114
observable.notifyChange(this);
116115
}
117116

118-
public boolean getSubscribed() {
119-
return userId != null && pushToken != null && userSubscriptionSetting && accepted;
117+
public boolean isSubscribed() {
118+
return userId != null && pushToken != null && !pushDisabled && accepted;
120119
}
121120

122121
void persistAsFrom() {
123122
OneSignalPrefs.saveBool(OneSignalPrefs.PREFS_ONESIGNAL,
124-
OneSignalPrefs.PREFS_ONESIGNAL_SUBSCRIPTION_LAST, userSubscriptionSetting);
123+
OneSignalPrefs.PREFS_ONESIGNAL_SUBSCRIPTION_LAST, pushDisabled);
125124
OneSignalPrefs.saveString(OneSignalPrefs.PREFS_ONESIGNAL,
126125
OneSignalPrefs.PREFS_ONESIGNAL_PLAYER_ID_LAST, userId);
127126
OneSignalPrefs.saveString(OneSignalPrefs.PREFS_ONESIGNAL,
@@ -131,7 +130,7 @@ void persistAsFrom() {
131130
}
132131

133132
boolean compare(OSSubscriptionState from) {
134-
return userSubscriptionSetting != from.userSubscriptionSetting
133+
return pushDisabled != from.pushDisabled
135134
|| !(userId != null ? userId : "").equals(from.userId != null ? from.userId : "")
136135
|| !(pushToken != null ? pushToken : "").equals(from.pushToken != null ? from.pushToken : "")
137136
|| accepted != from.accepted;
@@ -159,8 +158,8 @@ public JSONObject toJSONObject() {
159158
else
160159
mainObj.put("pushToken", JSONObject.NULL);
161160

162-
mainObj.put("userSubscriptionSetting", userSubscriptionSetting);
163-
mainObj.put("subscribed", getSubscribed());
161+
mainObj.put("isPushDisabled", isPushDisabled());
162+
mainObj.put("isSubscribed", isSubscribed());
164163
}
165164
catch(JSONException e) {
166165
e.printStackTrace();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ private static OSSubscriptionState getCurrentSubscriptionState(Context context)
421421
return null;
422422

423423
if (currentSubscriptionState == null) {
424-
currentSubscriptionState = new OSSubscriptionState(false, getCurrentPermissionState(context).getEnabled());
424+
currentSubscriptionState = new OSSubscriptionState(false, getCurrentPermissionState(context).areNotificationsEnabled());
425425
getCurrentPermissionState(context).observable.addObserver(currentSubscriptionState);
426426
currentSubscriptionState.observable.addObserverStrong(new OSSubscriptionChangedInternalObserver());
427427
}
@@ -2296,8 +2296,8 @@ private static long getLastSessionTime() {
22962296
}
22972297

22982298
/**
2299-
* You can call this method with {@code false} to opt users out of receiving all notifications through
2300-
* OneSignal. You can pass {@code true} later to opt users back into notifications.
2299+
* You can call this method with {@code true} to opt users out of receiving all notifications through
2300+
* OneSignal. You can pass {@code false} later to opt users back into notifications.
23012301
* @param disable whether to subscribe the user to notifications or not
23022302
*/
23032303
public static void disablePush(final boolean disable) {
@@ -2318,8 +2318,8 @@ public void run() {
23182318
if (shouldLogUserPrivacyConsentErrorMessageForMethodName(OSTaskController.SET_SUBSCRIPTION))
23192319
return;
23202320

2321-
getCurrentSubscriptionState(appContext).setUserSubscriptionSetting(disable);
2322-
OneSignalStateSynchronizer.setSubscription(disable);
2321+
getCurrentSubscriptionState(appContext).setPushDisabled(disable);
2322+
OneSignalStateSynchronizer.setSubscription(!disable);
23232323
}
23242324

23252325
/**

0 commit comments

Comments
 (0)