Skip to content

Commit

Permalink
Merge pull request #417 from Nightsd01/master
Browse files Browse the repository at this point in the history
Update Native iOS SDK
  • Loading branch information
Nightsd01 committed Mar 13, 2018
2 parents 087634f + 458168a commit d6fa076
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion ios/OneSignal.h
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ typedef NS_ENUM(NSInteger, OSNotificationPermission) {
@end


typedef void (^OSWebOpenURLResultBlock)(BOOL shouldOpen);

typedef void (^OSResultSuccessBlock)(NSDictionary* result);
typedef void (^OSFailureBlock)(NSError* error);
Expand All @@ -306,6 +307,9 @@ extern NSString * const kOSSettingsKeyInAppAlerts;
/*Enable In-App display of Launch URLs*/
extern NSString * const kOSSettingsKeyInAppLaunchURL;

/*Prompt user yes/no to open URL's from push notifications*/
extern NSString * const kOSSSettingsKeyPromptBeforeOpeningPushURL;

/* iOS10 +
Set notification's in-focus display option.
Value must be an OSNotificationDisplayType enum
Expand Down Expand Up @@ -364,7 +368,7 @@ typedef NS_ENUM(NSUInteger, ONE_S_LOG_LEVEL) {
+ (void)deleteTagsWithJsonString:(NSString*)jsonString;
// Optional method that sends us the user's email as an anonymized hash so that we can better target and personalize notifications sent to that user across their devices.
// Sends as MD5 and SHA1 of the provided email
+ (void)syncHashedEmail:(NSString*)email;
+ (void)syncHashedEmail:(NSString*)email __deprecated_msg("Please refer to our new Email methods/functionality such as setEmail(). This method will be removed in a future version of the OneSignal SDK");

// - Subscription and Permissions
+ (void)IdsAvailable:(OSIdsAvailableBlock)idsAvailableBlock __deprecated_msg("Please use getPermissionSubscriptionState or addSubscriptionObserver and addPermissionObserver instead.");
Expand Down
12 changes: 6 additions & 6 deletions ios/RCTOneSignal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

/* Begin PBXBuildFile section */
CA1CC868200FE3C3005B66AA /* RCTOneSignalExtensionService.m in Sources */ = {isa = PBXBuildFile; fileRef = CA1CC867200FE3C3005B66AA /* RCTOneSignalExtensionService.m */; };
CA8BBC6E205881CB002CDF67 /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA8BBC6D205881CB002CDF67 /* libOneSignal.a */; };
CACB39D6202D232A00D86CD1 /* RCTOneSignalEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = CACB39D5202D232A00D86CD1 /* RCTOneSignalEventEmitter.m */; };
CAE5CDE62033935A006992EC /* libOneSignal.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CAE5CDE52033935A006992EC /* libOneSignal.a */; };
FD2CCC851C772B4200B2B24E /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD2CCC841C772B4200B2B24E /* SystemConfiguration.framework */; };
FDB40CC41C5E4E5500CBF09B /* RCTOneSignal.m in Sources */ = {isa = PBXBuildFile; fileRef = FDB40CC31C5E4E5500CBF09B /* RCTOneSignal.m */; };
/* End PBXBuildFile section */
Expand All @@ -30,10 +30,10 @@
3245CDED1BFEE35C00EABF68 /* libRCTOneSignal.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTOneSignal.a; sourceTree = BUILT_PRODUCTS_DIR; };
CA1CC866200FE3C3005B66AA /* RCTOneSignalExtensionService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTOneSignalExtensionService.h; sourceTree = "<group>"; };
CA1CC867200FE3C3005B66AA /* RCTOneSignalExtensionService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTOneSignalExtensionService.m; sourceTree = "<group>"; };
CA8BBC6D205881CB002CDF67 /* libOneSignal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOneSignal.a; sourceTree = "<group>"; };
CA8BBC6F205881DB002CDF67 /* OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignal.h; sourceTree = "<group>"; };
CACB39D4202D232A00D86CD1 /* RCTOneSignalEventEmitter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTOneSignalEventEmitter.h; sourceTree = "<group>"; };
CACB39D5202D232A00D86CD1 /* RCTOneSignalEventEmitter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTOneSignalEventEmitter.m; sourceTree = "<group>"; };
CAE5CDE52033935A006992EC /* libOneSignal.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libOneSignal.a; sourceTree = "<group>"; };
CAE5CDE720339365006992EC /* OneSignal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignal.h; sourceTree = "<group>"; };
FD2CCC841C772B4200B2B24E /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
FDB40CC21C5E4E5500CBF09B /* RCTOneSignal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTOneSignal.h; sourceTree = "<group>"; };
FDB40CC31C5E4E5500CBF09B /* RCTOneSignal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTOneSignal.m; sourceTree = "<group>"; };
Expand All @@ -44,7 +44,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
CAE5CDE62033935A006992EC /* libOneSignal.a in Frameworks */,
CA8BBC6E205881CB002CDF67 /* libOneSignal.a in Frameworks */,
FD2CCC851C772B4200B2B24E /* SystemConfiguration.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -86,8 +86,8 @@
CA1CC858200FDEFC005B66AA /* Frameworks */ = {
isa = PBXGroup;
children = (
CAE5CDE720339365006992EC /* OneSignal.h */,
CAE5CDE52033935A006992EC /* libOneSignal.a */,
CA8BBC6F205881DB002CDF67 /* OneSignal.h */,
CA8BBC6D205881CB002CDF67 /* libOneSignal.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down
Binary file modified ios/libOneSignal.a
Binary file not shown.

0 comments on commit d6fa076

Please sign in to comment.