Merge pull request #1192 from OneSignal/user_model/testing

[user model] changes and fixes made during testing (round 1)

Author: nan-li

OneSignal.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.author           = { "Joseph Kalash" => "[email protected]", "Josh Kasten" => "[email protected]" , "Brad Hesse" => "[email protected]"}
 
   s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
-  s.platform         = :ios, "9.0"
+  s.platform         = :ios, "11.0"
   s.requires_arc     = true
 
   s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'

OneSignalXCFramework.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
     s.author           = { "Joseph Kalash" => "[email protected]", "Josh Kasten" => "[email protected]" , "Brad Hesse" => "[email protected]"}
 
     s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
-    s.platform         = :ios, '9.0'
+    s.platform         = :ios, '11.0'
     s.requires_arc     = true
 
     s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_XCFramework/OneSignalFramework.xcframework'

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h

@@ -31,7 +31,7 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver, OSInAppMessageLifecycleHandler>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSInAppMessageLifecycleHandler, OSPushSubscriptionObserver>
 
 @property (strong, nonatomic) UIWindow *window;
 

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -50,12 +50,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //    [FIRApp configure];
 
     NSLog(@"Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
-    
     [OneSignal.Debug setLogLevel:ONE_S_LL_VERBOSE];
     [OneSignal.Debug setVisualLevel:ONE_S_LL_NONE];
+    
+    [OneSignal initialize:[AppDelegate getOneSignalAppId] withLaunchOptions:launchOptions];
+    
     _notificationDelegate = [OneSignalNotificationCenterDelegate new];
 
     id openNotificationHandler = ^(OSNotificationOpenedResult *result) {
+        // TODO: opened handler Not triggered
         NSLog(@"OSNotificationOpenedResult: %@", result.action);
         #pragma clang diagnostic push
         #pragma clang diagnostic ignored "-Wdeprecated"
@@ -80,7 +83,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     // OneSignal Init with app id and lauch options
     [OneSignal setLaunchURLsInApp:YES];
     [OneSignal setProvidesNotificationSettingsView:NO];
-    [OneSignal initialize:[AppDelegate getOneSignalAppId] withLaunchOptions:launchOptions];
+    
 
     [OneSignal.Notifications requestPermission:^(BOOL accepted) {
         NSLog(@"OneSignal Demo App requestPermission: %d", accepted);
@@ -92,13 +95,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [OneSignal.Notifications setNotificationWillShowInForegroundHandler:notificationReceiverBlock];
     [OneSignal.Notifications setNotificationOpenedHandler:openNotificationHandler];
 
+    OSPushSubscriptionState* state = [OneSignal.User.pushSubscription addObserver:self];
+    NSLog(@"OneSignal Demo App push subscription observer added, current state: %@", state);
+    
+    [OneSignal.Notifications addPermissionObserver:self];
+    
     NSLog(@"UNUserNotificationCenter.delegate: %@", UNUserNotificationCenter.currentNotificationCenter.delegate);
 
     return YES;
 }
 
-#define ONESIGNAL_APP_ID_DEFAULT @"0ba9731b-33bd-43f4-8b59-61172e27447d"
-#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
+#define ONESIGNAL_APP_ID_DEFAULT @"1688d8f2-da7f-4815-8ee3-9d13788482c8"
+#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"1688d8f2-da7f-4815-8ee3-9d13788482c8"
 
 + (NSString*)getOneSignalAppId {
     NSString* userDefinedAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
@@ -118,10 +126,10 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
     NSLog(@"onOSPermissionChanged: %@", stateChanges);
 }
 
-- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
-    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
+- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges *)stateChanges {
+    NSLog(@"onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
     ViewController* mainController = (ViewController*) self.window.rootViewController;
-    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
+    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.optedIn;
 }
 
 #pragma mark OSInAppMessageDelegate

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

@@ -43,7 +43,7 @@
                                                     <constraint firstAttribute="width" constant="68" id="com-ja-CVD"/>
                                                 </constraints>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Get Tags"/>
+                                                <state key="normal" title="INFO"/>
                                                 <connections>
                                                     <action selector="getTagsButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Pp8-oA-Zrh"/>
                                                 </connections>
@@ -298,7 +298,7 @@
                                                 <rect key="frame" x="118" y="581" width="136" height="30"/>
                                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Set External User Id"/>
+                                                <state key="normal" title="Login to External User Id"/>
                                                 <connections>
                                                     <action selector="setExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="DXf-1K-Lkc"/>
                                                 </connections>
@@ -374,11 +374,11 @@
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <textInputTraits key="textInputTraits"/>
                                             </textField>
-                                            <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">
+                                            <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">
                                                 <rect key="frame" x="103" y="619" width="168" height="30"/>
                                                 <fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="15"/>
                                                 <color key="tintColor" red="1" green="0.1367101157" blue="0.01701983743" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                <state key="normal" title="Remove External User Id"/>
+                                                <state key="normal" title="Logout"/>
                                                 <connections>
                                                     <action selector="removeExternalUserId:" destination="BYZ-38-t0r" eventType="touchUpInside" id="F3N-HQ-tSv"/>
                                                 </connections>

iOS_SDK/OneSignalDevApp/OneSignalDevApp/OneSignalDevApp.entitlements

@@ -11,7 +11,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.onesignal.example.onesignal</string>
+		<string>group.com.onesignal.example.staging.onesignal</string>
 	</array>
 </dict>
 </plist>

iOS_SDK/OneSignalDevApp/OneSignalDevApp/ViewController.m

@@ -164,11 +164,14 @@ - (void)handleMessageAction:(NSString *)actionId {
 }
 
 - (IBAction)setExternalUserId:(UIButton *)sender {
-    NSLog(@"setExternalUserId is no longer supported. Please use login or addAlias.");
+    NSString* externalUserId = self.externalUserIdTextField.text;
+    NSLog(@"Dev App: Logging in to external user ID %@", externalUserId);
+    [OneSignal login:externalUserId];
 }
 
 - (IBAction)removeExternalUserId:(UIButton *)sender {
-    NSLog(@"setExternalUserId is no longer supported. Please use logout or removeAlias.");
+    NSLog(@"Dev App: Logout called.");
+    [OneSignal logout];
 }
 
 #pragma mark UITextFieldDelegate Methods

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.h

@@ -9,7 +9,8 @@
 #import <UIKit/UIKit.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver>
+// TODO: Add subscription observer
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver>
 
 @property (strong, nonatomic) UIWindow *window;
 

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m

@@ -116,11 +116,12 @@ - (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
     NSLog(@"onOSPermissionChanged: %@", stateChanges);
 }
 
-- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
-    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
-    ViewController* mainController = (ViewController*) self.window.rootViewController;
-    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
-}
+// TODO: Add push sub observer
+//- (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
+//    NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
+//    ViewController* mainController = (ViewController*) self.window.rootViewController;
+//    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.isSubscribed;
+//}
 
 - (void)applicationWillResignActive:(UIApplication *)application {
 }

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/OneSignalDevAppClip.entitlements

@@ -11,7 +11,7 @@
 	</array>
 	<key>com.apple.developer.parent-application-identifiers</key>
 	<array>
-		<string>$(AppIdentifierPrefix)com.onesignal.example</string>
+		<string>$(AppIdentifierPrefix)com.onesignal.example.staging</string>
 	</array>
 </dict>
 </plist>