Skip to content

Commit

Permalink
Merge pull request #255 from urbanairship/release-7.3.0
Browse files Browse the repository at this point in the history
Release 7.3.0
  • Loading branch information
crow authored Sep 26, 2018
2 parents 9d19c66 + 8bdc732 commit 80d7349
Show file tree
Hide file tree
Showing 42 changed files with 140 additions and 266 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
src/ios/Airship/libUAirship-9.4.0.a filter=lfs diff=lfs merge=lfs -text
src/ios/Airship/libUAirship-10.0.0.a filter=lfs diff=lfs merge=lfs -text
7 changes: 6 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
=================================
Version 7.3.0 - September 25, 2018
=================================
- Updated iOS SDK to 10.0.0

=================================
Version 7.2.1 - September 20, 2018
=================================
Expand All @@ -10,7 +15,7 @@ Version 7.2.0 - July 26, 2018
- Updated iOS SDK to 9.3.3
- Updated Android SDK to 9.4.1
- Added setter for foreground presentation options
- Enabled takeOff from the JS interface for iOS and Android
- Enabled takeOff from the JS interface for iOS and Android

=================================
Version 7.1.1 - June 15, 2018
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "urbanairship-cordova",
"version": "7.2.1",
"version": "7.3.0",
"description": "Urban Airship Cordova plugin",
"cordova": {
"id": "urbanairship-cordova",
Expand Down
4 changes: 2 additions & 2 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin id="urbanairship-cordova"
version="7.2.1"
version="7.3.0"
xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android">

Expand Down Expand Up @@ -338,7 +338,7 @@
<resource-file src="src/ios/Airship/AirshipResources.bundle"/>

<!-- Airship library -->
<source-file framework="true" src="src/ios/Airship/libUAirship-9.4.0.a"/>
<source-file framework="true" src="src/ios/Airship/libUAirship-10.0.0.a"/>

<!-- System frameworks -->
<framework src="libsqlite3.dylib" />
Expand Down
Binary file modified src/ios/Airship/AirshipResources.bundle/Info.plist
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified src/ios/Airship/AirshipResources.bundle/UARateAppPromptView.nib
Binary file not shown.
43 changes: 0 additions & 43 deletions src/ios/Airship/Headers/UAAppIntegration.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,49 +90,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
+ (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler;

#if !TARGET_OS_TV // UIUserNotificationSettings not available on tvOS
/**
* Must be called by the UIApplicationDelegate's
* application:didRegisterUserNotificationSettings:.
*
* Note: This method is relevant only for apps targeting iOS 8 and iOS 9.
*
* @param application The application instance.
* @param notificationSettings The user notification settings.
* @deprecated Deprecated in iOS 10.
*/
+ (void)application:(UIApplication *)application didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings NS_DEPRECATED_IOS(8_0, 10_0, "Deprecated in iOS 10");
#endif

#if !TARGET_OS_TV // Delegate methods unavailable in tvOS
/**
* Must be called by the UIApplicationDelegate's
* application:handleActionWithIdentifier:forRemoteNotification:completionHandler
*
* Note: This method is relevant only for apps targeting iOS 8 and iOS 9.
*
* @param application The application instance.
* @param identifier The action identifier.
* @param userInfo The remote notification.
* @param handler The completion handler
*/
+ (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:(NSDictionary *)userInfo completionHandler:(void (^)(void))handler;

/**
* Must be called by the UIApplicationDelegate's
* application:handleActionWithIdentifier:forRemoteNotification:withResponseInfo:completionHandler
*
* Note: This method is relevant only for apps targeting iOS 8 and iOS 9.
*
* @param application The application instance.
* @param identifier The action identifier.
* @param userInfo The remote notification.
* @param responseInfo The user response info.
* @param handler The completion handler
*/
+ (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:(NSDictionary *)userInfo withResponseInfo:(nullable NSDictionary *)responseInfo completionHandler:(void (^)(void))handler;
#endif

@end

NS_ASSUME_NONNULL_END
Expand Down
12 changes: 11 additions & 1 deletion src/ios/Airship/Headers/UAGlobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,36 @@ typedef NS_ENUM(NSInteger, UALogLevel) {

/**
* Log error messages.
*
* Used for critical errors, parse exceptions and other situations that cannot be gracefully handled.
*/
UALogLevelError = 1,

/**
* Log warning messages.
*
* Used for API deprecations, invalid setup and other potentially problematic situations.
*/
UALogLevelWarn = 2,

/**
* Log informative messages.
*
* Used for reporting general SDK status.
*/
UALogLevelInfo = 3,

/**
* Log debugging messages.
*
* Used for reporting general SDK status with more detailed information.
*/
UALogLevelDebug = 4,

/**
* Log detailed tracing messages.
*
* Used for reporting highly detailed SDK status that can be useful when debugging and troubleshooting.
*/
UALogLevelTrace = 5
};
Expand Down Expand Up @@ -117,7 +127,7 @@ NSLog(@"\n\n" \
"\t .-' '-. .-. \n"\
"\t /.' '.\\/ / \n"\
"\t |=- -=| ( \n"\
"\t \'. .'/\\ \\ \n"\
"\t \\'. .'/\\ \\ \n"\
"\t '-.,_____ _____.-' '-' \n"\
"\t [_____]=8 \n\n\n");

Expand Down
4 changes: 4 additions & 0 deletions src/ios/Airship/Headers/UAInAppMessageHTMLAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#import "UAInAppMessageAdapterProtocol.h"
#import "UAInAppMessageHTMLStyle.h"

NS_ASSUME_NONNULL_BEGIN

/**
* HTML in-app message display adapter.
*/
Expand All @@ -20,3 +22,5 @@ extern NSString *const UAHTMLStyleFileName;
@property(nonatomic, strong, nullable) UAInAppMessageHTMLStyle *style;

@end

NS_ASSUME_NONNULL_END
2 changes: 1 addition & 1 deletion src/ios/Airship/Headers/UAInAppMessageStyleProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
/**
* Factory method to create a style from a provided plist.
*/
+ (instancetype)styleWithContentsOfFile:(nullable NSString *)path;
+ (nullable instancetype)styleWithContentsOfFile:(nullable NSString *)path;

@end

Expand Down
9 changes: 0 additions & 9 deletions src/ios/Airship/Headers/UAInbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)richPushMessageAvailable:(UAInboxMessage *)richPushMessage;

/**
* Called when the inbox is requested to be displayed by the UADisplayInboxAction.
*
* @param message The Rich Push message
*
* @deprecated Deprecated - to be removed in SDK version 10.0
*/
- (void)showInboxMessage:(UAInboxMessage *)message DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 10.0");

/**
* Called when the inbox is requested to be displayed by the UADisplayInboxAction.
*
Expand Down
23 changes: 0 additions & 23 deletions src/ios/Airship/Headers/UAJSONMatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,6 @@ extern NSString * const UAJSONMatcherErrorDomain;
*/
+ (instancetype)matcherWithValueMatcher:(UAJSONValueMatcher *)valueMatcher;

/**
* Factory method to create a JSON matcher.
*
* @param valueMatcher Matcher to apply to the value.
* @param key Used to path into the object before evaluating the value.
* @return A JSON matcher.
*
* @deprecated Deprecated - to be removed in SDK version 10.0. Please use matcherWithValueMatcher:scope:.
*/
+ (instancetype)matcherWithValueMatcher:(UAJSONValueMatcher *)valueMatcher key:(NSString *)key DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 10.0");

/**
* Factory method to create a JSON matcher.
*
* @param valueMatcher Matcher to apply to the value.
* @param key Used to path into the object before evaluating the value.
* @param scope Used to path into the object before evaluating the value.
* @return A JSON matcher.
*
* @deprecated Deprecated - to be removed in SDK version 10.0. Please use matcherWithValueMatcher:scope:.
*/
+ (instancetype)matcherWithValueMatcher:(UAJSONValueMatcher *)valueMatcher key:(NSString *)key scope:(NSArray<NSString *>*)scope DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 10.0");

/**
* Factory method to create a JSON matcher.
*
Expand Down
10 changes: 10 additions & 0 deletions src/ios/Airship/Headers/UAMessageCenterListViewController.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,14 @@
*/
- (void)displayMessageForID:(NSString *)messageID onError:(void (^)(void))completion;

/**
* Initializes a Message Center List view controller.
*
* @param nibNameOrNil The name of the nib file to associate with the view controller.
* @param nibBundleOrNil The bundle in which to search for the nib file.
* @param splitViewController The UISplitViewController managing the inbox and message views.
* @return The initialized Message Center List view controller.
*/
- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil splitViewController:(UISplitViewController *)splitViewController;

@end
10 changes: 0 additions & 10 deletions src/ios/Airship/Headers/UAMessageCenterMessageViewProtocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property (nonatomic, copy) void (^closeBlock)(BOOL animated);

/**
* Load a UAInboxMessage.
* @param message The message to load and display.
* @param onlyIfChanged Only load the message if it is different from the currently displayed message
*
* @deprecated Deprecated - to be removed in SDK version 10.0
*/

- (void)loadMessage:(nullable UAInboxMessage *)message onlyIfChanged:(BOOL)onlyIfChanged DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 10.0");

/**
* Load a UAInboxMessage by message ID.
*
Expand Down
22 changes: 1 addition & 21 deletions src/ios/Airship/Headers/UANotificationAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,7 @@ static const UANotificationActionOptions UANotificationActionOptionNone NS_SWIFT
/// @name Notification Action Utilities
///---------------------------------------------------------------------------------------

#if TARGET_OS_IOS // UIUserNotificationAction and UNNotificationAction not available on tvOS

/**
* Converts a UANotificationAction into a UIUserNotificationAction.
*
* @return An instance of UIUserNotificationAction or nil if conversion fails.
* @deprecated Deprecated in iOS 10.
*/
- (nullable UIUserNotificationAction *)asUIUserNotificationAction NS_DEPRECATED_IOS(8_0, 10_0, "Deprecated in iOS 10");
#if TARGET_OS_IOS // UNNotificationAction not available on tvOS

/**
* Converts a UANotificationAction into a UNNotificationAction.
Expand All @@ -106,18 +98,6 @@ static const UANotificationActionOptions UANotificationActionOptionNone NS_SWIFT
*/
- (nullable UNNotificationAction *)asUNNotificationAction __IOS_AVAILABLE(10.0);


/**
* Tests for equivalence with a UIUserNotificationAction. As UANotificationAction is a
* drop-in replacement for UNNotificationAction, any features not applicable
* in UIUserNotificationAction will be ignored.
*
* @param notificationAction The UIUserNotificationAction to compare with.
* @return `YES` if the two actions are equivalent, `NO` otherwise.
* @deprecated Deprecated in iOS 10.
*/
- (BOOL)isEqualToUIUserNotificationAction:(UIUserNotificationAction *)notificationAction NS_DEPRECATED_IOS(8_0, 10_0, "Deprecated in iOS 10");

/**
* Tests for equivalence with a UNNotificationAction.
*
Expand Down
58 changes: 32 additions & 26 deletions src/ios/Airship/Headers/UANotificationCategory.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ static const UANotificationCategoryOptions UANotificationCategoryOptionNone NS_S
*
* Note: This property is only applicable on iOS 11 and above.
*/
@property(readonly, copy, nonatomic) NSString *hiddenPreviewsBodyPlaceholder;
@property(readonly, copy, nonatomic, nullable) NSString *hiddenPreviewsBodyPlaceholder;

/**
* A format string for a summary description when notifications from this category are grouped together.
*
* Note: This property is only applicable on iOS 12 and above.
*/
@property (readonly, nonatomic, nullable) NSString *categorySummaryFormat;

/**
* Options for how to handle notifications of this type.
Expand All @@ -74,7 +81,7 @@ static const UANotificationCategoryOptions UANotificationCategoryOptionNone NS_S
*
* @param identifier The category identifier
* @param actions An array of user notification actions
* @param intentIdentifiers The intents supported support for notifications of this category.
* @param intentIdentifiers The intents supported for notifications of this category.
* @param options Constants indicating how to handle notifications associated with this category.
* @return The user notification category created or `nil` if an error occurred.
*/
Expand All @@ -88,7 +95,7 @@ static const UANotificationCategoryOptions UANotificationCategoryOptionNone NS_S
*
* @param identifier The category identifier
* @param actions An array of user notification actions
* @param intentIdentifiers The intents supported support for notifications of this category.
* @param intentIdentifiers The intents supported for notifications of this category.
* @param hiddenPreviewsBodyPlaceholder A placeholder string to display when the user has disabled
notification previews for the app.
* @param options Constants indicating how to handle notifications associated with this category.
Expand All @@ -97,42 +104,41 @@ static const UANotificationCategoryOptions UANotificationCategoryOptionNone NS_S
+ (instancetype)categoryWithIdentifier:(NSString *)identifier
actions:(NSArray<UANotificationAction *> *)actions
intentIdentifiers:(NSArray<NSString *> *)intentIdentifiers
hiddenPreviewsBodyPlaceholder:(NSString *)hiddenPreviewsBodyPlaceholder
hiddenPreviewsBodyPlaceholder:(nullable NSString *)hiddenPreviewsBodyPlaceholder
options:(UANotificationCategoryOptions)options;

///---------------------------------------------------------------------------------------
/// @name Notification Category Utilities
///---------------------------------------------------------------------------------------

#if TARGET_OS_IOS // UIUserNotificationAction and UNNotificationAction not available on tvOS

/**
* Converts a UANotificationCategory into a UIUserNotificationCategory.
* Creates a user notification category with the specified parameters.
*
* @return An instance of UIUserNotificationCategory.
* @deprecated Deprecated in iOS 10.
* @param identifier The category identifier
* @param actions An array of user notification actions
* @param intentIdentifiers The intents supported for notifications of this category.
* @param hiddenPreviewsBodyPlaceholder A placeholder string to display when the user has disabled
notification previews for the app.
* @param format A format string for a summary description when notifications from this
category are grouped together
* @param options Constants indicating how to handle notifications associated with this category.
* @return The user notification category created or `nil` if an error occurred.
*/
- (UIUserNotificationCategory *)asUIUserNotificationCategory NS_DEPRECATED_IOS(8_0, 10_0, "Deprecated in iOS 10");
+ (instancetype)categoryWithIdentifier:(NSString *)identifier
actions:(NSArray<UANotificationAction *> *)actions
intentIdentifiers:(NSArray<NSString *> *)intentIdentifiers
hiddenPreviewsBodyPlaceholder:(nullable NSString *)hiddenPreviewsBodyPlaceholder
categorySummaryFormat:(nullable NSString *)format
options:(UANotificationCategoryOptions)options __IOS_AVAILABLE(10.0);

///---------------------------------------------------------------------------------------
/// @name Notification Category Utilities
///---------------------------------------------------------------------------------------

#if TARGET_OS_IOS // UNNotificationAction not available on tvOS
/**
* Converts a UANotificationCategory into a UNNotificationCategory.
*
* @return An instance of UNNotificationCategory.
*/
- (null_unspecified UNNotificationCategory *)asUNNotificationCategory __IOS_AVAILABLE(10.0);


/**
* Tests for equivalence with a UIUserNotificationCategory. As UANotificationCategory is a
* drop-in replacement for UNNotificationCategory, any features not applicable
* in UIUserNotificationCategory will be ignored.
*
* @param category The UIUserNotificationCategory to compare with.
* @return `YES` if the two categories are equivalent, `NO` otherwise.
* @deprecated Deprecated in iOS 10.
*/
- (BOOL)isEqualToUIUserNotificationCategory:(UIUserNotificationCategory *)category NS_DEPRECATED_IOS(8_0, 10_0, "Deprecated in iOS 10");

/**
* Tests for equivalence with a UNNotificationCategory.
*
Expand Down
Loading

0 comments on commit 80d7349

Please sign in to comment.