Merge pull request #253 from urbanairship/release-7.2.1

Release 7.2.1

.gitattributes

@@ -0,0 +1 @@
+src/ios/Airship/libUAirship-9.4.0.a filter=lfs diff=lfs merge=lfs -text

CHANGELOG

@@ -1,3 +1,9 @@
+=================================
+Version 7.2.1 - September 20, 2018
+=================================
+- Updated iOS SDK to 9.4.0
+- Updated Android SDK to 9.5.2
+
 =================================
 Version 7.2.0 - July 26, 2018
 =================================

config_sample.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.urbanairship.richpush" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.urbanairship.sample" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Test</name>
     <description>
         A sample Apache Cordova application that responds to the deviceready event.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "urbanairship-cordova",
-  "version": "7.2.0",
+  "version": "7.2.1",
   "description": "Urban Airship Cordova plugin",
   "cordova": {
     "id": "urbanairship-cordova",

plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin id="urbanairship-cordova"
-        version="7.2.0"
+        version="7.2.1"
         xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -321,6 +321,7 @@
         <header-file src="src/ios/Airship/Headers/UAChannelCapture.h" />
         <header-file src="src/ios/Airship/Headers/UAWKWebViewDelegate.h" />
         <header-file src="src/ios/Airship/Headers/UAInAppMessageBannerDisplayContent.h" />
+        <header-file src="src/ios/Airship/Headers/UAInAppMessageHTMLStyle.h" />
         <header-file src="src/ios/Airship/Headers/UAOpenExternalURLAction.h" />
         <header-file src="src/ios/Airship/Headers/UAMessageCenter.h" />
         <header-file src="src/ios/Airship/Headers/UAInAppMessageButtonStyle.h" />
@@ -337,7 +338,7 @@
         <resource-file src="src/ios/Airship/AirshipResources.bundle"/>
 
         <!-- Airship library -->
-        <source-file framework="true" src="src/ios/Airship/libUAirship-9.3.3.a"/>
+        <source-file framework="true" src="src/ios/Airship/libUAirship-9.4.0.a"/>
 
         <!-- System frameworks -->
         <framework src="libsqlite3.dylib" />

src/android/build-extras.gradle

@@ -19,12 +19,12 @@ allprojects {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-core:16.0.0'
+    implementation 'com.google.firebase:firebase-core:16.0.3'
     implementation 'com.android.support:support-v4:27.1.1'
     implementation 'com.android.support:support-annotations:27.1.1'
     implementation 'com.google.android.gms:play-services-location:15.0.1'
     implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.urbanairship.android:urbanairship-fcm:9.4.1'
+    implementation 'com.urbanairship.android:urbanairship-fcm:9.5.2'
 }
 
 cdvPluginPostBuildExtras.push({

src/ios/Airship/Headers/AirshipLib.h

@@ -91,6 +91,7 @@
 #import "UAInAppMessageFullScreenStyle.h"
 #import "UAInAppMessageHTMLAdapter.h"
 #import "UAInAppMessageHTMLDisplayContent.h"
+#import "UAInAppMessageHTMLStyle.h"
 #import "UAInAppMessageManager.h"
 #import "UAInAppMessageMediaInfo.h"
 #import "UAInAppMessageMediaStyle.h"

src/ios/Airship/Headers/UAInAppMessageAudience.h

@@ -8,6 +8,25 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/**
+ * Audience check miss behaviors
+ */
+typedef NS_ENUM(NSInteger, UAInAppMessageAudienceMissBehaviorType) {
+    /**
+     * Cancel the message's schedule when the audience check fails.
+     */
+    UAInAppMessageAudienceMissBehaviorCancel,
+
+    /**
+     * Skip the message's schedule when the audience check fails.
+     */
+    UAInAppMessageAudienceMissBehaviorSkip,
+
+    /**
+     * Skip and penalize the message's schedule when the audience check fails.
+     */
+    UAInAppMessageAudienceMissBehaviorPenalize,
+};
 
 /**
  * Builder class for UAInAppMessageAudience.
@@ -39,6 +58,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, strong, nullable) UAJSONPredicate *versionPredicate;
 
+/**
+ * The audience check miss behavior.
+ */
+@property(nonatomic, assign) UAInAppMessageAudienceMissBehaviorType missBehavior;
+
 /**
  * Checks if the builder is valid and will produce a audience.
  * @return YES if the builder is valid, otherwise NO.
@@ -77,6 +101,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, readonly, nullable) UAJSONPredicate *versionPredicate;
 
+/**
+ * The audience check miss behavior.
+ */
+@property(nonatomic, readonly, assign) UAInAppMessageAudienceMissBehaviorType missBehavior;
+
 /**
  * Factory method for building audience model from a builder block.
  *
@@ -85,8 +114,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (instancetype)audienceWithBuilderBlock:(void(^)(UAInAppMessageAudienceBuilder *builder))builderBlock;
 
-
-
 @end
 
 NS_ASSUME_NONNULL_END

src/ios/Airship/Headers/UAInAppMessageBannerStyle.h

@@ -80,7 +80,7 @@ extern NSString *const UABannerMaxWidthKey;
 @property(nonatomic, strong, nullable) UAInAppMessageMediaStyle *mediaStyle;
 
 /**
- * The max width.
+ * The max width in points.
  */
 @property(nonatomic, strong, nullable) NSNumber *maxWidth;
 

src/ios/Airship/Headers/UAInAppMessageDisplayContent.h

@@ -74,6 +74,7 @@ extern NSString *const UAInAppMessageDismissButtonColorKey;
 extern NSString *const UAInAppMessageFooterKey;
 extern NSString *const UAInAppMessageDurationKey;
 extern NSString *const UAInAppMessageModalAllowsFullScreenKey;
+extern NSString *const UAInAppMessageHTMLAllowsFullScreenKey;
 
 
 /**

src/ios/Airship/Headers/UAInAppMessageHTMLAdapter.h

@@ -2,10 +2,21 @@
 
 #import <Foundation/Foundation.h>
 #import "UAInAppMessageAdapterProtocol.h"
+#import "UAInAppMessageHTMLStyle.h"
 
 /**
  * HTML in-app message display adapter.
  */
 @interface UAInAppMessageHTMLAdapter : NSObject <UAInAppMessageAdapterProtocol>
 
+/**
+ * HTML in-app message display style defaults plist name.
+ */
+extern NSString *const UAHTMLStyleFileName;
+
+/**
+ * HTML in-app message display style.
+ */
+@property(nonatomic, strong, nullable) UAInAppMessageHTMLStyle *style;
+
 @end

src/ios/Airship/Headers/UAInAppMessageHTMLDisplayContent.h

@@ -27,6 +27,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, copy, nullable) NSString *url;
 
+/**
+ * The HTML message's border radius. Defaults to 0.
+ */
+@property(nonatomic, assign) NSUInteger borderRadius;
+
+/**
+ * Flag indicating the HTML view should display as full screen on compact devices.
+ * Defaults to NO.
+ */
+@property(nonatomic, assign) BOOL allowFullScreenDisplay;
+
 /**
  * Checks if the builder is valid and will produce an display content instance.
  * @return YES if the builder is valid, otherwise NO.
@@ -55,6 +66,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property(nonatomic, strong, readonly) UIColor *dismissButtonColor;
 
+/**
+ * The HTML message's border radius. Defaults to 0.
+ */
+@property(nonatomic, assign, readonly) NSUInteger borderRadius;
+
+/**
+ * Flag indicating the HTML view should display as full screen on compact devices.
+ * Defaults to NO.
+ */
+@property(nonatomic, assign, readonly) BOOL allowFullScreenDisplay;
+
 /**
  * Factory method for building HTML display content with a builder block.
  *

src/ios/Airship/Headers/UAInAppMessageHTMLStyle.h

@@ -0,0 +1,64 @@
+/* Copyright 2018 Urban Airship and Contributors */
+
+#import "UAInAppMessageStyleProtocol.h"
+#import "UAPadding.h"
+#import "UAInAppMessageTextStyle.h"
+#import "UAInAppMessageButtonStyle.h"
+#import "UAInAppMessageMediaStyle.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * The key representing the dismissIconResource in a style plist.
+ */
+extern NSString *const UAHTMLDismissIconResourceKey;
+
+/**
+ * The key representing the additionalPadding in a style plist.
+ */
+extern NSString *const UAHTMLAdditionalPaddingKey;
+
+/**
+ * The key representing the max width in a style plist.
+ */
+extern NSString *const UAHTMLMaxWidthKey;
+
+/**
+ * The key representing the max height in a style plist.
+ */
+extern NSString *const UAHTMLMaxHeightKey;
+
+/**
+ * Model object representing a custom style to be applied
+ * to HTML in-app messages.
+ */
+@interface UAInAppMessageHTMLStyle : NSObject<UAInAppMessageStyleProtocol>
+
+///---------------------------------------------------------------------------------------
+/// @name HTML Style Properties
+///---------------------------------------------------------------------------------------
+
+/**
+ * The constants added to the default spacing between a view and its parent.
+ */
+@property(nonatomic, strong) UAPadding *additionalPadding;
+
+/**
+ * The dismiss icon image resource name.
+ */
+@property(nonatomic, strong, nullable) NSString *dismissIconResource;
+
+/**
+ * The max width in points.
+ */
+@property(nonatomic, strong, nullable) NSNumber *maxWidth;
+
+/**
+ * The max height in points.
+ */
+@property(nonatomic, strong, nullable) NSNumber *maxHeight;
+
+@end
+
+NS_ASSUME_NONNULL_END
+

src/ios/Airship/Headers/UAInAppMessageModalStyle.h

@@ -74,12 +74,12 @@ extern NSString *const UAModalMaxHeightKey;
 @property(nonatomic, strong, nullable) NSString *dismissIconResource;
 
 /**
- * The max width.
+ * The max width in points.
  */
 @property(nonatomic, strong, nullable) NSNumber *maxWidth;
 
 /**
- * The max height.
+ * The max height in points.
  */
 @property(nonatomic, strong, nullable) NSNumber *maxHeight;
 

src/ios/Airship/Headers/UAScheduleInfo.h

@@ -27,14 +27,16 @@ extern NSUInteger const UAScheduleInfoMaxTriggers;
 @property(nonatomic, assign) NSInteger priority;
 
 /**
- * Number of times the actions will be triggered until the schedule is
- * finished.
+ * The max number of times the schedule may be executed.
+ *
+ * For in-app messages, if the audience condition checks fail, and
+ * the miss behavior is `skip`, the triggered schedule will not count towards
+ * the limit.
  */
 @property(nonatomic, assign) NSUInteger limit;
 
 /**
- * Array of triggers. Triggers define conditions on when to run
- * the actions.
+ * Array of triggers. Triggers define conditions on when to execute the schedule.
  */
 @property(nonatomic, strong, nullable) NSArray<UAScheduleTrigger *> *triggers;
 
@@ -82,14 +84,16 @@ extern NSUInteger const UAScheduleInfoMaxTriggers;
 @property(nonatomic, readonly) NSInteger priority;
 
 /**
- * Array of triggers. Triggers define conditions on when to run
- * the actions.
+ * Array of triggers. Triggers define conditions on when to execute the schedule.
  */
 @property(nonatomic, readonly) NSArray<UAScheduleTrigger *> *triggers;
 
 /**
- * Number of times the actions will be triggered until the schedule is
- * canceled.
+ * The max number of times the schedule may be executed.
+ *
+ * For in-app messages, if the audience condition checks fail, and
+ * the miss behavior is `skip`, the triggered schedule will not count towards
+ * the limit.
  */
 @property(nonatomic, readonly) NSUInteger limit;