Skip to content

Commit 1d8e1e7

Browse files
committed
update email and sms subscriptions API
* addSms becomes addSms * removeSmsNumber becomes removeSms * return void when removing, not bool
1 parent 9470f07 commit 1d8e1e7

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ - (IBAction)removeEmailButton:(id)sender {
100100
- (IBAction)addSmsButton:(id)sender {
101101
NSString *sms = self.smsTextField.text;
102102
NSLog(@"Dev App: Add sms: %@", sms);
103-
[OneSignal.User addSmsNumber:sms];
103+
[OneSignal.User addSms:sms];
104104
}
105105

106106
- (IBAction)removeSmsButton:(id)sender {
107107
NSString *sms = self.smsTextField.text;
108108
NSLog(@"Dev App: Removing sms: %@", sms);
109-
[OneSignal.User removeSmsNumber:sms];
109+
[OneSignal.User removeSms:sms];
110110
}
111111

112112
- (IBAction)addAliasButton:(UIButton *)sender {

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
112112
Returns false if this model does not exist in the store.
113113
This can happen if remove email or SMS is called and it doesn't exist in the store.
114114
*/
115-
public func remove(_ id: String) -> Bool {
115+
public func remove(_ id: String) {
116116
OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSModelStore remove() called with model \(id)")
117117
// TODO: Nothing will happen if model doesn't exist in the store
118118
if let model = models[id] {
@@ -127,9 +127,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
127127
self.changeSubscription.fire { modelStoreListener in
128128
modelStoreListener.onRemoved(model)
129129
}
130-
return true
131130
}
132-
return false
133131
}
134132

135133
/**

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ import OneSignalNotifications
6060
func removeTags(_ tags: [String])
6161
// Email
6262
func addEmail(_ email: String)
63-
func removeEmail(_ email: String) -> Bool
63+
func removeEmail(_ email: String)
6464
// SMS
65-
func addSmsNumber(_ number: String)
66-
func removeSmsNumber(_ number: String) -> Bool
65+
func addSms(_ number: String)
66+
func removeSms(_ number: String)
6767
// Language
6868
func setLanguage(_ language: String)
6969
// JWT Token Expire
@@ -612,16 +612,16 @@ extension OneSignalUserManagerImpl: OSUser {
612612
This will be a no-op and no request will be made.
613613
Error handling needs to be implemented in the future.
614614
*/
615-
public func removeEmail(_ email: String) -> Bool {
615+
public func removeEmail(_ email: String) {
616616
guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "removeEmail") else {
617-
return false
617+
return
618618
}
619619
// Check if is valid email?
620620
createUserIfNil()
621-
return self.subscriptionModelStore.remove(email)
621+
self.subscriptionModelStore.remove(email)
622622
}
623623

624-
public func addSmsNumber(_ number: String) {
624+
public func addSms(_ number: String) {
625625
guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "addSmsNumber") else {
626626
return
627627
}
@@ -644,13 +644,13 @@ extension OneSignalUserManagerImpl: OSUser {
644644
This will be a no-op and no request will be made.
645645
Error handling needs to be implemented in the future.
646646
*/
647-
public func removeSmsNumber(_ number: String) -> Bool {
647+
public func removeSms(_ number: String) {
648648
guard !OneSignalConfigManager.shouldAwaitAppIdAndLogMissingPrivacyConsent(forMethod: "removeSmsNumber") else {
649-
return false
649+
return
650650
}
651651
// Check if is valid SMS?
652652
createUserIfNil()
653-
return self.subscriptionModelStore.remove(number)
653+
self.subscriptionModelStore.remove(number)
654654
}
655655

656656
public func setLanguage(_ language: String) {

0 commit comments

Comments
 (0)