Merge 021100 into master

OneSignal.podspec

@@ -1,16 +1,16 @@
 Pod::Spec.new do |s|
   s.name             = "OneSignal"
-  s.version          = "2.10.2"
+  s.version          = "2.11.0"
   s.summary          = "OneSignal push notification library for mobile apps."
   s.homepage         = "https://onesignal.com"
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
   s.author           = { "Joseph Kalash" => "joseph@onesignal.com", "Josh Kasten" => "josh@onesignal.com" , "Brad Hesse" => "brad@onesignal.com"}
-
+  
   s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
-
+  
   s.platform     = :ios
   s.requires_arc = true
-
+  
   s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/Framework/OneSignal.framework'
-  s.framework               = 'SystemConfiguration', 'UIKit', 'UserNotifications', 'WebKit'
+  s.framework               = 'SystemConfiguration', 'UIKit', 'UserNotifications', 'WebKit', 'CoreGraphics'
 end

OneSignalDynamic.podspec

@@ -1,16 +1,17 @@
 Pod::Spec.new do |s|
    s.name             = "OneSignalDynamic"
-   s.version          = "2.10.2"
+   s.version          = "2.11.0"
    s.summary          = "OneSignal push notification library for mobile apps."
    s.homepage         = "https://onesignal.com"
    s.license          = { :type => 'MIT', :file => 'LICENSE' }
    s.author           = { "Joseph Kalash" => "joseph@onesignal.com", "Josh Kasten" => "josh@onesignal.com" , "Brad Hesse" => "brad@onesignal.com"}
-
+   
    s.source           = { :git => "https://github.com/OneSignal/OneSignal-iOS-SDK.git", :tag => s.version.to_s }
-
+   
    s.platform     = :ios, "8.0"
    s.requires_arc = true
-
+   
    s.ios.vendored_frameworks = 'iOS_SDK/OneSignalSDK/Framework/Dynamic/OneSignal.framework'
-   s.framework               = 'SystemConfiguration', 'UIKit', 'UserNotifications', 'WebKit'
+   s.framework               = 'SystemConfiguration', 'UIKit', 'UserNotifications', 'WebKit', 'CoreGraphics'
  end
+

iOS_SDK/OneSignalDevApp/OneSignalDevApp.xcodeproj/project.pbxproj

@@ -8,8 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03432CDB1EBD426A0071FC48 /* CoreLocation.framework */; };
-		03FA99F7231EEEC90003405A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FA99F6231EEEC90003405A /* WebKit.framework */; };
-		03FA99F8231EEF090003405A /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03FA99F6231EEEC90003405A /* WebKit.framework */; };
 		4529DECC1FA7EAB800CEAB1D /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91B6EA051E83215000B5CF01 /* UserNotifications.framework */; };
 		4529DEFA1FA91FBF00CEAB1D /* FirebaseAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4529DEF91FA91FBF00CEAB1D /* FirebaseAnalytics.framework */; };
 		4529DEFC1FA9201200CEAB1D /* FirebaseCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4529DEFB1FA9201000CEAB1D /* FirebaseCore.framework */; };
@@ -41,6 +39,8 @@
 		91B6EA081E8321B400B5CF01 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9112E8A31E724DCB0022A1CB /* libOneSignal.a */; };
 		91B6EA0A1E834B1700B5CF01 /* sentImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 91B6EA091E834B1700B5CF01 /* sentImage.jpg */; };
 		91B6EA0C1E834BD800B5CF01 /* sentImage.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 91B6EA091E834B1700B5CF01 /* sentImage.jpg */; };
+		CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
+		CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CACBAAB5218A7136000ACAA5 /* WebKit.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -69,7 +69,6 @@
 
 /* Begin PBXFileReference section */
 		03432CDB1EBD426A0071FC48 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		03FA99F6231EEEC90003405A /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		4529DEF91FA91FBF00CEAB1D /* FirebaseAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseAnalytics.framework; sourceTree = "<group>"; };
 		4529DEFB1FA9201000CEAB1D /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseCore.framework; sourceTree = "<group>"; };
 		4529DEFD1FA921D900CEAB1D /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
@@ -99,14 +98,15 @@
 		9150E7821E73BFB600C5D46A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		91B6EA051E83215000B5CF01 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
 		91B6EA091E834B1700B5CF01 /* sentImage.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = sentImage.jpg; sourceTree = "<group>"; };
+		CACBAAB5218A7136000ACAA5 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		9112E87F1E724C320022A1CB /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				03FA99F8231EEF090003405A /* WebKit.framework in Frameworks */,
+				CACBAAB6218A7136000ACAA5 /* WebKit.framework in Frameworks */,
 				4529DF041FA929F800CEAB1D /* FirebaseNanoPB.framework in Frameworks */,
 				9112E8A51E724ECC0022A1CB /* libOneSignal.a in Frameworks */,
 				03432CDC1EBD426A0071FC48 /* CoreLocation.framework in Frameworks */,
@@ -124,13 +124,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CACBAAB7218A713C000ACAA5 /* WebKit.framework in Frameworks */,
 				454EB3281FABEF3E0093AD9B /* FirebaseAnalytics.framework in Frameworks */,
 				454EB3271FABEF3A0093AD9B /* FirebaseCore.framework in Frameworks */,
 				454EB3261FABEF380093AD9B /* FirebaseInstanceID.framework in Frameworks */,
 				454EB3251FABEF350093AD9B /* nanopb.framework in Frameworks */,
 				454EB3241FABEF320093AD9B /* FirebaseNanoPB.framework in Frameworks */,
 				454EB3231FABEF2F0093AD9B /* GoogleToolboxForMac.framework in Frameworks */,
-				03FA99F7231EEEC90003405A /* WebKit.framework in Frameworks */,
 				91B6EA081E8321B400B5CF01 /* libOneSignal.a in Frameworks */,
 				91B6EA071E83215800B5CF01 /* UIKit.framework in Frameworks */,
 				91B6EA061E83215000B5CF01 /* UserNotifications.framework in Frameworks */,
@@ -190,7 +190,7 @@
 		9112E8A21E724DCA0022A1CB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				03FA99F6231EEEC90003405A /* WebKit.framework */,
+				CACBAAB5218A7136000ACAA5 /* WebKit.framework */,
 				4529DF051FA92C7F00CEAB1D /* GoogleToolboxForMac.framework */,
 				4529DF031FA929F700CEAB1D /* FirebaseNanoPB.framework */,
 				4529DF011FA9292800CEAB1D /* nanopb.framework */,
@@ -304,6 +304,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -494,6 +495,7 @@
 				INFOPLIST_FILE = OneSignalDevApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.h

@@ -31,10 +31,12 @@
 #import <UIKit/UIKit.h>
 #import <OneSignal/OneSignal.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver, OSEmailSubscriptionObserver, OSNotificationDisplayTypeDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, OSPermissionObserver, OSSubscriptionObserver, OSEmailSubscriptionObserver>
 
 @property (strong, nonatomic) UIWindow *window;
 
++ (NSString*)getOneSignalAppId;
++ (void) setOneSignalAppId:(NSString*)onesignalAppId;
 
 @end
 

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -38,11 +38,11 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
 
-    [FIRApp configure];
+//    [FIRApp configure];
 
     NSLog(@"Bundle URL: %@", [[NSBundle mainBundle] bundleURL]);
 
-    [OneSignal setLogLevel:ONE_S_LL_VERBOSE visualLevel:ONE_S_LL_ERROR];
+    [OneSignal setLogLevel:ONE_S_LL_VERBOSE visualLevel:ONE_S_LL_NONE];
 
     OneSignal.inFocusDisplayType = OSNotificationDisplayTypeInAppAlert;
 
@@ -52,38 +52,62 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
         UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Notifiation Opened" message:@"Notification Opened" delegate:self cancelButtonTitle:@"Delete" otherButtonTitles:@"Cancel", nil];
         [alert show];
     };
-
-
-    [OneSignal setSubscription:true];
-
-
+
     id notificationReceiverBlock = ^(OSNotification *notification) {
         NSLog(@"Received Notification - %@", notification.payload.notificationID);
     };
 
+    // Example block for IAM action click handler
+    id inAppMessagingActionClickBlock = ^(OSInAppMessageAction *action) {
+        NSString *message = [NSString stringWithFormat:@"Click Action Occurred: clickName:%@ clickUrl:%@ firstClick:%i closesMessage:%i",
+                             action.clickName,
+                             action.clickUrl,
+                             action.firstClick,
+                             action.closesMessage];
+        [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:message];
+    };
+
+    [OneSignal setSubscription:true];
+
+    // Example setter for IAM action click handler using OneSignal public method
+    [OneSignal setInAppMessageClickHandler:inAppMessagingActionClickBlock];
+
     [OneSignal initWithLaunchOptions:launchOptions
-                               appId:@"5dc0b8c7-335a-4c4c-9ed4-266cbf2158ac"
+                               appId:[AppDelegate getOneSignalAppId]
           handleNotificationReceived:notificationReceiverBlock
             handleNotificationAction:openNotificationHandler
                             settings:@{kOSSettingsKeyAutoPrompt: @false,
                                        kOSSettingsKeyInAppLaunchURL: @true}];
 
     [OneSignal promptLocation];
     [OneSignal sendTag:@"someKey1122" value:@"03222017"];
-
-    OneSignal.inFocusDisplayType = OSNotificationDisplayTypeNotification;
-
+
     [OneSignal addPermissionObserver:self];
     [OneSignal addSubscriptionObserver:self];
     [OneSignal addEmailSubscriptionObserver:self];
 
-    [OneSignal setNotificationDisplayTypeDelegate:self];
-    
+    [OneSignal pauseInAppMessages:false];
+
     NSLog(@"UNUserNotificationCenter.delegate: %@", UNUserNotificationCenter.currentNotificationCenter.delegate);
 
     return YES;
 }
 
+#define ONESIGNAL_APP_ID_KEY_FOR_TESTING @"ONESIGNAL_APP_ID_KEY_FOR_TESTING"
+
++ (NSString*)getOneSignalAppId {
+    NSString* onesignalAppId = [[NSUserDefaults standardUserDefaults] objectForKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
+    if (!onesignalAppId)
+        onesignalAppId = @"77e32082-ea27-42e3-a898-c72e141824ef";
+
+    return onesignalAppId;
+}
+
++ (void) setOneSignalAppId:(NSString*)onesignalAppId {
+    [[NSUserDefaults standardUserDefaults] setObject:onesignalAppId forKey:ONESIGNAL_APP_ID_KEY_FOR_TESTING];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+}
+
 - (void) onOSSubscriptionChanged:(OSSubscriptionStateChanges*)stateChanges {
     NSLog(@"onOSSubscriptionChanged: %@", stateChanges);
     NSLog(@"HERE");
@@ -99,16 +123,6 @@ -(void)onOSEmailSubscriptionChanged:(OSEmailSubscriptionStateChanges *)stateChan
 
 }
 
-- (void)willPresentInFocusNotificationWithPayload:(OSNotificationPayload *)payload
-                                   withCompletion:(OSNotificationDisplayTypeResponse)completion {
-    if (payload.additionalData[@"overrideDisplayType"]) {
-        OSNotificationDisplayType newType = (OSNotificationDisplayType)[payload.additionalData[@"overrideDisplayType"] intValue];
-
-        completion(newType);
-    }
-}
-
-
 - (void)applicationWillResignActive:(UIApplication *)application {
 }