Merge pull request #214 from urbanairship/MB-2534

MB-2534 Corova plugin 7.0

CHANGELOG

@@ -1,3 +1,10 @@
+
+=================================
+Version 7.0.0 - February 14, 2018
+=================================
+- Updated iOS SDK to 9.0.2.
+- Updated Android SDK to 9.0.1.
+
 ================================
 Version 6.9.3 - February 1, 2018
 ================================

MIGRATION.md

@@ -1,5 +1,9 @@
 # Migration Guide
 
+## 6.x to 7.0.0
+
+The method `setDisplayASAPEnabled` has been removed.
+
 ## 6.x to 6.3.0
 
 ### Cocoapods

package.json

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

src/android/UAirshipPlugin.java

@@ -104,7 +104,7 @@ public class UAirshipPlugin extends CordovaPlugin {
             "setQuietTimeEnabled", "setQuietTime", "recordCurrentLocation", "clearNotifications", "registerListener", "setAnalyticsEnabled", "isAnalyticsEnabled",
             "setNamedUser", "getNamedUser", "runAction", "editNamedUserTagGroups", "editChannelTagGroups", "displayMessageCenter", "markInboxMessageRead",
             "deleteInboxMessage", "getInboxMessages", "displayInboxMessage", "overlayInboxMessage", "refreshInbox", "getDeepLink", "setAssociatedIdentifier",
-            "isAppNotificationsEnabled", "setDisplayASAPEnabled", "dismissMessageCenter", "dismissInboxMessage", "dismissOverlayInboxMessage");
+            "isAppNotificationsEnabled", "dismissMessageCenter", "dismissInboxMessage", "dismissOverlayInboxMessage");
 
     private ExecutorService executorService = Executors.newFixedThreadPool(1);
 
@@ -222,20 +222,6 @@ void setUserNotificationsEnabled(JSONArray data, CallbackContext callbackContext
         callbackContext.success();
     }
 
-    /**
-     * Enables or disables display ASAP mode for in-app messages.
-     * <p/>
-     * Expected arguments: Boolean
-     *
-     * @param data The call data.
-     * @param callbackContext The callback context.
-     */
-    void setDisplayASAPEnabled(JSONArray data, CallbackContext callbackContext) throws JSONException {
-        boolean enabled = data.getBoolean(0);
-        UAirship.shared().getInAppMessageManager().setDisplayAsapEnabled(enabled);
-        callbackContext.success();
-    }
-
     /**
      * Checks if user notifications are enabled or not.
      *

src/android/build-extras.gradle

@@ -6,11 +6,11 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:[26.0.2,)'
-    compile 'com.android.support:support-annotations:[26.0.2,)'
-    compile 'com.google.android.gms:play-services-gcm:[11.0.1,)'
-    compile 'com.android.support:cardview-v7:[26.0.2,)'
-    compile 'com.google.android.gms:play-services-location:[11.0.1,)'
-    compile 'com.android.support:appcompat-v7:[26.0.2,)'
-    compile 'com.urbanairship.android:urbanairship-sdk:8.9.7'
+    compile 'com.android.support:support-v4:[27.0.2,)'
+    compile 'com.android.support:support-annotations:[27.0.2,)'
+    compile 'com.google.android.gms:play-services-gcm:[11.8.0,)'
+    compile 'com.android.support:cardview-v7:[27.0.2,)'
+    compile 'com.google.android.gms:play-services-location:[11.8.0,)'
+    compile 'com.android.support:appcompat-v7:[27.0.2,)'
+    compile 'com.urbanairship.android:urbanairship-sdk:9.0.1'
 }

src/ios/Airship/Headers/AirshipLib.h

@@ -3,7 +3,6 @@
 #import "NSOperationQueue+UAAdditions.h"
 #import "NSString+UALocalizationAdditions.h"
 #import "NSString+UAURLEncoding.h"
-#import "UA_Base64.h"
 #import "UAAccountEventTemplate.h"
 #import "UAAction+Operators.h"
 #import "UAAction.h"
@@ -12,7 +11,7 @@
 #import "UAActionRegistryEntry.h"
 #import "UAActionResult.h"
 #import "UAActionRunner.h"
-#import "UAActionSchedule.h"
+#import "UAActionScheduleEdits.h"
 #import "UAActionScheduleInfo.h"
 #import "UAAddCustomEventAction.h"
 #import "UAAddTagsAction.h"
@@ -27,6 +26,7 @@
 #import "UACancelSchedulesAction.h"
 #import "UAChannelRegistrar.h"
 #import "UACircularRegion.h"
+#import "UAComponent.h"
 #import "UAConfig.h"
 #import "UACustomEvent.h"
 #import "UADeepLinkAction.h"
@@ -36,12 +36,10 @@
 #import "UAFetchDeviceInfoAction.h"
 #import "UAGlobal.h"
 #import "UAInstallAttributionEvent.h"
-#import "UAirship.h"
-#import "UAirshipVersion.h"
-#import "UAJavaScriptDelegate.h"
 #import "UAJSONMatcher.h"
 #import "UAJSONPredicate.h"
 #import "UAJSONValueMatcher.h"
+#import "UAJavaScriptDelegate.h"
 #import "UALocation.h"
 #import "UALocationEvent.h"
 #import "UAMediaEventTemplate.h"
@@ -58,52 +56,70 @@
 #import "UARegionEvent.h"
 #import "UARemoveTagsAction.h"
 #import "UARetailEventTemplate.h"
+#import "UASchedule.h"
 #import "UAScheduleAction.h"
 #import "UAScheduleDelay.h"
+#import "UAScheduleEdits.h"
+#import "UAScheduleInfo.h"
 #import "UAScheduleTrigger.h"
 #import "UATextInputNotificationAction.h"
 #import "UAURLProtocol.h"
 #import "UAUser.h"
 #import "UAUtils.h"
 #import "UAWhitelist.h"
+#import "UA_Base64.h"
+#import "UAirship.h"
+#import "UAirshipVersion.h"
 #import "UAActionJSDelegate.h"
 #import "UAActivityViewController.h"
 #import "UABaseNativeBridge.h"
 #import "UAChannelCapture.h"
 #import "UAChannelCaptureAction.h"
-#import "UADefaultMessageCenter.h"
-#import "UADefaultMessageCenterListCell.h"
-#import "UADefaultMessageCenterListViewController.h"
-#import "UADefaultMessageCenterMessageViewController.h"
-#import "UADefaultMessageCenterSplitViewController.h"
-#import "UADefaultMessageCenterStyle.h"
 #import "UADisplayInboxAction.h"
 #import "UAInAppMessage.h"
-#import "UAInAppMessageButtonActionBinding.h"
-#import "UAInAppMessageControllerDefaultDelegate.h"
-#import "UAInAppMessageControllerDelegate.h"
-#import "UAInAppMessageView.h"
-#import "UAInAppMessaging.h"
+#import "UAInAppMessageAdapterProtocol.h"
+#import "UAInAppMessageAudience.h"
+#import "UAInAppMessageBannerAdapter.h"
+#import "UAInAppMessageBannerDisplayContent.h"
+#import "UAInAppMessageButtonInfo.h"
+#import "UAInAppMessageCustomDisplayContent.h"
+#import "UAInAppMessageDisplayContent.h"
+#import "UAInAppMessageFullScreenAdapter.h"
+#import "UAInAppMessageFullScreenDisplayContent.h"
+#import "UAInAppMessageHTMLAdapter.h"
+#import "UAInAppMessageHTMLDisplayContent.h"
+#import "UAInAppMessageManager.h"
+#import "UAInAppMessageMediaInfo.h"
+#import "UAInAppMessageModalAdapter.h"
+#import "UAInAppMessageModalDisplayContent.h"
+#import "UAInAppMessageResolution.h"
+#import "UAInAppMessageScheduleEdits.h"
+#import "UAInAppMessageScheduleInfo.h"
+#import "UAInAppMessageTagSelector.h"
+#import "UAInAppMessageTextInfo.h"
 #import "UAInbox.h"
 #import "UAInboxMessage.h"
 #import "UAInboxMessageList.h"
 #import "UAInboxUtils.h"
 #import "UALandingPageAction.h"
-#import "UALandingPageOverlayController.h"
+#import "UALegacyInAppMessage.h"
+#import "UALegacyInAppMessaging.h"
+#import "UAMessageCenter.h"
 #import "UAMessageCenterDateUtils.h"
+#import "UAMessageCenterListCell.h"
+#import "UAMessageCenterListViewController.h"
 #import "UAMessageCenterLocalization.h"
 #import "UAMessageCenterMessageViewController.h"
 #import "UAMessageCenterMessageViewProtocol.h"
+#import "UAMessageCenterSplitViewController.h"
+#import "UAMessageCenterStyle.h"
 #import "UAOverlayInboxMessageAction.h"
 #import "UAOverlayViewController.h"
 #import "UAPasteboardAction.h"
 #import "UARateAppAction.h"
-#import "UARichContentWindow.h"
 #import "UAShareAction.h"
-#import "UAUIWebViewDelegate.h"
-#import "UAWalletAction.h"
-#import "UAWebViewCallData.h"
-#import "UAWebViewDelegate.h"
 #import "UAWKWebViewDelegate.h"
 #import "UAWKWebViewNativeBridge.h"
+#import "UAWalletAction.h"
+#import "UAWebViewCallData.h"
 #import "UIWebView+UAAdditions.h"

src/ios/Airship/Headers/NSJSONSerialization+UAAdditions.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 

src/ios/Airship/Headers/NSManagedObjectContext+UAAdditions.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <CoreData/CoreData.h>
 

src/ios/Airship/Headers/NSOperationQueue+UAAdditions.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 

src/ios/Airship/Headers/NSString+UALocalizationAdditions.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 

src/ios/Airship/Headers/NSString+UAURLEncoding.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 
@@ -13,26 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// @name NSString URL Encoding Additions Core Methods
 ///---------------------------------------------------------------------------------------
 
-/**
- * URL decodes the receiver.
- * @param encoding The desired NSStringEncoding for the result.
- * @return A URL decoded NSString, or `nil` if decoding failed.
- *
- * @deprecated Deprecated - to be removed in SDK version 9.0
- *
- */
-- (nullable NSString *)urlDecodedStringWithEncoding:(NSStringEncoding)encoding DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 9.0");
-
-/**
- * URL encodes the receiver.
- * @param encoding The desired NSStringEncoding for the result.
- * @return A URL encoded NSString, or `nil` if encoding failed.
- *
- * @deprecated Deprecated - to be removed in SDK version 9.0
- */
-- (nullable NSString *)urlEncodedStringWithEncoding:(NSStringEncoding)encoding DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 9.0");
-
-
 /**
  * URL decodes the receiver.
  *

src/ios/Airship/Headers/UAAccountEventTemplate.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UACustomEvent.h"

src/ios/Airship/Headers/UAAction+Operators.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import "UAAction.h"
 

src/ios/Airship/Headers/UAAction.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UAActionResult.h"

src/ios/Airship/Headers/UAActionArguments.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 
@@ -59,14 +59,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface UAActionArguments : NSObject
 
-/**
- * Metadata key for the web view. Available when an action is triggered from
- * a web view.
- *
- * @deprecated Deprecated - to be removed in SDK version 9.0
- */
-extern NSString * const UAActionMetadataWebViewKey DEPRECATED_MSG_ATTRIBUTE("Deprecated - to be removed in SDK version 9.0");
-
 /**
  * Metadata key for the push notification. Available when an action is triggered
  * from a push notification or user notification action.

src/ios/Airship/Headers/UAActionJSDelegate.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UAJavaScriptDelegate.h"

src/ios/Airship/Headers/UAActionRegistry.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UAAction.h"

src/ios/Airship/Headers/UAActionRegistryEntry.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UAAction.h"

src/ios/Airship/Headers/UAActionResult.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>

src/ios/Airship/Headers/UAActionRunner.h

@@ -1,4 +1,4 @@
-/* Copyright 2017 Urban Airship and Contributors */
+/* Copyright 2018 Urban Airship and Contributors */
 
 #import <Foundation/Foundation.h>
 #import "UAAction.h"

src/ios/Airship/Headers/UAActionScheduleEdits.h

@@ -0,0 +1,55 @@
+/* Copyright 2018 Urban Airship and Contributors */
+
+#import <Foundation/Foundation.h>
+#import "UAScheduleEdits.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Builder class for UAActionScheduleEdits.
+ */
+@interface UAActionScheduleEditsBuilder : UAScheduleEditsBuilder
+
+///---------------------------------------------------------------------------------------
+/// @name Action Schedule Edits Builder Properties
+///---------------------------------------------------------------------------------------
+
+/**
+ * Actions payload to run when the schedule is triggered.
+ */
+@property(nonatomic, strong, nullable) NSDictionary *actions;
+
+@end
+
+/**
+ * Defines the action schedule edits.
+ */
+@interface UAActionScheduleEdits : UAScheduleEdits
+
+///---------------------------------------------------------------------------------------
+/// @name Action Schedule Edits Properties
+///---------------------------------------------------------------------------------------
+
+/**
+ * Actions payload to run when the schedule is triggered.
+ */
+@property(nonatomic, readonly, nullable) NSDictionary *actions;
+
+///---------------------------------------------------------------------------------------
+/// @name Action Schedule Edits Factories
+///---------------------------------------------------------------------------------------
+
+/**
+ * Creates an action schedule edits with a builder block.
+ *
+ * @return The action schedule edits.
+ */
++ (instancetype)editsWithBuilderBlock:(void(^)(UAActionScheduleEditsBuilder *builder))builderBlock;
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+
+