Skip to content

Commit dfbba12

Browse files
nan-linan-li
authored
Merge pull request #1200 from OneSignal/user_model/more_alpha_1_fixes_round_2
[user model] More fixes for alpha release (round 3)
2 parents 02cfc96 + ef72e71 commit dfbba12

38 files changed

+586
-657
lines changed

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
#import <UIKit/UIKit.h>
3232
#import <OneSignalFramework/OneSignalFramework.h>
3333

34-
// TODO: Add subscription observer
35-
@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler>
34+
@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler, OSPushSubscriptionObserver>
3635

3736
@property (strong, nonatomic) UIWindow *window;
3837

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5050
// [FIRApp configure];
5151

5252
NSLog(@"Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
53+
[OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
54+
[OneSignal.Debug setVisualLevel:ONE_S_LL_NONE];
5355

5456
[OneSignal initialize:[AppDelegate getOneSignalAppId] withLaunchOptions:launchOptions];
5557

56-
[OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
57-
[OneSignal.Debug setVisualLevel:ONE_S_LL_NONE];
5858
_notificationDelegate = [OneSignalNotificationCenterDelegate new];
5959

6060
id openNotificationHandler = ^(OSNotificationOpenedResult *result) {
61+
// TODO: opened handler Not triggered
6162
NSLog(@"OSNotificationOpenedResult: %@", result.action);
6263
#pragma clang diagnostic push
6364
#pragma clang diagnostic ignored "-Wdeprecated"
@@ -94,6 +95,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
9495
[OneSignal.Notifications setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
9596
[OneSignal.Notifications setNotificationOpenedHandler:openNotificationHandler];
9697

98+
OSPushSubscriptionState* state = [OneSignal.User.pushSubscription addObserver:self];
99+
NSLog(@"OneSignal Demo App push subscription observer added, current state: %@", state);
100+
101+
[OneSignal.Notifications addPermissionObserver:self];
102+
97103
NSLog(@"UNUserNotificationCenter.delegate: %@", UNUserNotificationCenter.currentNotificationCenter.delegate);
98104

99105
return YES;
@@ -120,12 +126,11 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
120126
NSLog(@"onOSPermissionChanged: %@", stateChanges);
121127
}
122128

123-
// TODO: Add push sub observer
124-
//- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
125-
// NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
126-
// ViewController* mainController = (ViewController*) self.window.rootViewController;
127-
// mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
128-
//}
129+
- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges *)stateChanges {
130+
NSLog(@"onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
131+
ViewController* mainController = (ViewController*) self.window.rootViewController;
132+
mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.optedIn;
133+
}
129134

130135
#pragma mark OSInAppMessageDelegate
131136

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/Base.lproj/Main.storyboard‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<constraint firstAttribute="width" constant="68" id="com-ja-CVD"/>
4444
</constraints>
4545
<color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
46-
<state key="normal" title="Get Tags"/>
46+
<state key="normal" title="INFO"/>
4747
<connections>
4848
<action selector="getTagsButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Pp8-oA-Zrh"/>
4949
</connections>
@@ -298,7 +298,7 @@
298298
<rect key="frame" x="118" y="581" width="136" height="30"/>
299299
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
300300
<color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
301-
<state key="normal" title="Set External User Id"/>
301+
<state key="normal" title="Login to External User Id"/>
302302
<connections>
303303
<action selector="setExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="DXf-1K-Lkc"/>
304304
</connections>
@@ -374,11 +374,11 @@
374374
<fontDescription key="fontDescription" type="system" pointSize="14"/>
375375
<textInputTraits key="textInputTraits"/>
376376
</textField>
377-
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OiG-L7-Ot2" userLabel="Remove External User Id">
377+
<button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OiG-L7-Ot2" userLabel="Logout">
378378
<rect key="frame" x="103" y="619" width="168" height="30"/>
379379
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
380380
<color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
381-
<state key="normal" title="Remove External User Id"/>
381+
<state key="normal" title="Logout"/>
382382
<connections>
383383
<action selector="removeExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="F3N-HQ-tSv"/>
384384
</connections>

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</array>
1212
<key>com.apple.security.application-groups</key>
1313
<array>
14-
<string>group.com.onesignal.example.onesignal</string>
14+
<string>group.com.onesignal.example.staging.onesignal</string>
1515
</array>
1616
</dict>
1717
</plist>

‎iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,14 @@ - (void)handleMessageAction:(NSString *)actionId {
164164
}
165165

166166
- (IBAction)setExternalUserId:(UIButton *)sender {
167-
NSLog(@"setExternalUserId is no longer supported. Please use login or addAlias.");
167+
NSString* externalUserId = self.externalUserIdTextField.text;
168+
NSLog(@"Dev App: Logging in to external user ID %@", externalUserId);
169+
[OneSignal login:externalUserId];
168170
}
169171

170172
- (IBAction)removeExternalUserId:(UIButton *)sender {
171-
NSLog(@"setExternalUserId is no longer supported. Please use logout or removeAlias.");
173+
NSLog(@"Dev App: Logout called.");
174+
[OneSignal logout];
172175
}
173176

174177
#pragma mark UITextFieldDelegate Methods

‎iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</array>
1212
<key>com.apple.developer.parent-application-identifiers</key>
1313
<array>
14-
<string>$(AppIdentifierPrefix)com.onesignal.example</string>
14+
<string>$(AppIdentifierPrefix)com.onesignal.example.staging</string>
1515
</array>
1616
</dict>
1717
</plist>

‎iOS_SDK/OneSignalDevApp/OneSignalExample.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
);
746746
MARKETING_VERSION = 1.4.4;
747747
OTHER_LDFLAGS = "-ObjC";
748-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
748+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging;
749749
PRODUCT_NAME = OneSignalExample;
750750
SUPPORTS_MACCATALYST = YES;
751751
SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h";
@@ -776,7 +776,7 @@
776776
);
777777
MARKETING_VERSION = 1.4.4;
778778
OTHER_LDFLAGS = "-ObjC";
779-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
779+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging;
780780
PRODUCT_NAME = OneSignalExample;
781781
SUPPORTS_MACCATALYST = YES;
782782
SWIFT_OBJC_BRIDGING_HEADER = "OneSignalDevApp/OneSignalExample-Bridging-Header.h";
@@ -804,7 +804,7 @@
804804
);
805805
MARKETING_VERSION = 1.4.4;
806806
OTHER_LDFLAGS = "-ObjC";
807-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
807+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA;
808808
PRODUCT_NAME = "$(TARGET_NAME)";
809809
SKIP_INSTALL = YES;
810810
SUPPORTS_MACCATALYST = YES;
@@ -832,7 +832,7 @@
832832
);
833833
MARKETING_VERSION = 1.4.4;
834834
OTHER_LDFLAGS = "-ObjC";
835-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
835+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.OneSignalNotificationServiceExtensionA;
836836
PRODUCT_NAME = "$(TARGET_NAME)";
837837
SKIP_INSTALL = YES;
838838
SUPPORTS_MACCATALYST = YES;
@@ -877,7 +877,7 @@
877877
MARKETING_VERSION = 1.4.4;
878878
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
879879
MTL_FAST_MATH = YES;
880-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
880+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.Clip;
881881
PRODUCT_NAME = OneSignalExampleClip;
882882
TARGETED_DEVICE_FAMILY = "1,2";
883883
};
@@ -915,7 +915,7 @@
915915
);
916916
MARKETING_VERSION = 1.4.4;
917917
MTL_FAST_MATH = YES;
918-
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.Clip;
918+
PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.staging.Clip;
919919
PRODUCT_NAME = OneSignalExampleClip;
920920
TARGETED_DEVICE_FAMILY = "1,2";
921921
};

‎iOS_SDK/OneSignalDevApp/OneSignalNotificationServiceExtension/OneSignalNotificationServiceExtension.entitlements‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.com.onesignal.example.onesignal</string>
7+
<string>group.com.onesignal.example.staging.onesignal</string>
88
</array>
99
</dict>
1010
</plist>

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/API/OSRequests.h‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333

3434
NS_ASSUME_NONNULL_BEGIN
3535

36-
@interface OSRequestGetTags : OneSignalRequest
37-
+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId;
38-
@end
39-
4036
@interface OSRequestGetIosParams : OneSignalRequest
4137
+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId;
4238
@end
@@ -45,72 +41,12 @@ NS_ASSUME_NONNULL_BEGIN
4541
+ (instancetype)withAppId:(NSString *)appId withJson:(NSMutableDictionary *)json;
4642
@end
4743

48-
@interface OSRequestUpdateNotificationTypes : OneSignalRequest
49-
+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId notificationTypes:(NSNumber *)notificationTypes;
50-
@end
51-
52-
@interface OSRequestSendPurchases : OneSignalRequest
53-
+ (instancetype)withUserId:(NSString *)userId externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases;
54-
+ (instancetype)withUserId:(NSString *)userId emailAuthToken:(NSString *)emailAuthToken appId:(NSString *)appId withPurchases:(NSArray *)purchases;
55-
@end
56-
5744
@interface OSRequestSubmitNotificationOpened : OneSignalRequest
5845
+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId wasOpened:(BOOL)opened messageId:(NSString *)messageId withDeviceType:(NSNumber *)deviceType;
5946
@end
6047

61-
@interface OSRequestSyncHashedEmail : OneSignalRequest
62-
+ (instancetype)withUserId:(NSString *)userId appId:(NSString *)appId email:(NSString *)email networkType:(NSNumber *)netType;
63-
@end
64-
6548
NS_ASSUME_NONNULL_END
6649

67-
@interface OSRequestRegisterUser : OneSignalRequest
68-
+ (instancetype _Nonnull)withData:(NSDictionary * _Nonnull)registrationData userId:(NSString * _Nullable)userId;
69-
@end
70-
71-
@interface OSRequestCreateDevice : OneSignalRequest
72-
+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId withDeviceType:(NSNumber * _Nonnull)deviceType withEmail:(NSString * _Nullable)email withPlayerId:(NSString * _Nullable)playerId withEmailAuthHash:(NSString * _Nullable)emailAuthHash withExternalUserId:(NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
73-
74-
+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId withDeviceType:(NSNumber * _Nonnull)deviceType withSMSNumber:(NSString * _Nullable)smsNumber withPlayerId:(NSString * _Nullable)playerId withSMSAuthHash:(NSString * _Nullable)smsAuthHash withExternalUserId:(NSString * _Nullable)externalUserId withExternalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
75-
@end
76-
77-
@interface OSRequestLogoutEmail : OneSignalRequest
78-
+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId emailPlayerId:(NSString * _Nonnull)emailPlayerId devicePlayerId:(NSString * _Nonnull)devicePlayerId emailAuthHash:(NSString * _Nullable)emailAuthHash;
79-
@end
80-
81-
@interface OSRequestLogoutSMS : OneSignalRequest
82-
+ (instancetype _Nonnull)withAppId:(NSString * _Nonnull)appId smsPlayerId:(NSString * _Nonnull)smsPlayerId smsAuthHash:(NSString * _Nullable)smsAuthHash devicePlayerId:(NSString * _Nonnull)devicePlayerId;
83-
@end
84-
85-
@interface OSRequestSendTagsToServer : OneSignalRequest
86-
+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId tags:(NSDictionary * _Nonnull)tags networkType:(NSNumber * _Nonnull)netType withEmailAuthHashToken:(NSString * _Nullable)emailAuthToken withExternalIdAuthHashToken:(NSString * _Nullable)externalIdAuthToken;
87-
88-
+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId tags:(NSDictionary * _Nonnull)tags networkType:(NSNumber * _Nonnull)netType withSMSAuthHashToken:(NSString * _Nullable)smsAuthToken withExternalIdAuthHashToken:(NSString * _Nullable)externalIdAuthToken;
89-
@end
90-
91-
@interface OSRequestUpdateLanguage : OneSignalRequest
92-
+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId
93-
appId:(NSString * _Nonnull)appId
94-
language:(NSString * _Nonnull)language
95-
emailAuthToken:(NSString * _Nullable)emailAuthHash
96-
externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
97-
98-
+ (instancetype _Nonnull)withUserId:(NSString * _Nonnull)userId
99-
appId:(NSString * _Nonnull)appId
100-
language:(NSString * _Nonnull)language
101-
smsAuthToken:(NSString * _Nullable)smsAuthToken
102-
externalIdAuthToken:(NSString * _Nullable)externalIdAuthToken;
103-
@end
104-
105-
@interface OSRequestUpdateExternalUserId : OneSignalRequest
106-
+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId appId:(NSString * _Nonnull)appId;
107-
108-
+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId withEmailHashToken:(NSString * _Nullable)emailHashToken appId:(NSString * _Nonnull)appId;
109-
110-
+ (instancetype _Nonnull)withUserId:(NSString * _Nullable)externalId withUserIdHashToken:(NSString * _Nullable)hashToken withOneSignalUserId:(NSString * _Nonnull)userId withSMSHashToken:(NSString * _Nullable)smsHashToken appId:(NSString * _Nonnull)appId;
111-
@end
112-
113-
11450
@interface OSRequestTrackV1 : OneSignalRequest
11551
+ (instancetype _Nonnull)trackUsageData:(NSString * _Nonnull)osUsageData
11652
appId:(NSString * _Nonnull)appId;

0 commit comments

Comments
 (0)