Skip to content
This repository has been archived by the owner on Jan 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #106 from Adobe-Marketing-Cloud/ios-4.7.1
Browse files Browse the repository at this point in the history
iOS 4.7.1
  • Loading branch information
hunterpeterson committed Oct 23, 2015
2 parents 75997a0 + 935352e commit a448d40
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 11 deletions.
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
id="com.adobe.ADBMobile"
version="4.7.0">
version="4.7.1">
<name>ADBMobile</name>
<description>Adobe Mobile Services Plugin</description>

Expand Down
32 changes: 22 additions & 10 deletions sdks/iOS/AdobeMobileLibrary/ADBMobile.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Copyright 1996-2015. Adobe, Inc. All Rights Reserved
//
// SDK Version: 4.7.0
// SDK Version: 4.7.1

#import <Foundation/Foundation.h>
@class CLLocation, CLBeacon, TVApplicationController, ADBTargetLocationRequest, ADBMediaSettings, ADBMediaState;
Expand All @@ -18,9 +18,9 @@
* @see setPrivacyStatus
*/
typedef NS_ENUM(NSUInteger, ADBMobilePrivacyStatus) {
ADBMobilePrivacyStatusOptIn = 1, /*!< Enum value ADBMobilePrivacyStatusOptIn. */
ADBMobilePrivacyStatusOptOut = 2, /*!< Enum value ADBMobilePrivacyStatusOptOut. */
ADBMobilePrivacyStatusUnknown = 3 /*!< Enum value ADBMobilePrivacyStatusUnknown. @note only available in conjunction with offline tracking */
ADBMobilePrivacyStatusOptIn = 1, /*!< Enum value ADBMobilePrivacyStatusOptIn. */
ADBMobilePrivacyStatusOptOut = 2, /*!< Enum value ADBMobilePrivacyStatusOptOut. */
ADBMobilePrivacyStatusUnknown = 3 /*!< Enum value ADBMobilePrivacyStatusUnknown. @note only available in conjunction with offline tracking */
};

/**
Expand Down Expand Up @@ -287,9 +287,9 @@ typedef NS_ENUM(NSUInteger, ADBMobilePrivacyStatus) {
* @return An ADBMediaSettings pointer.
*/
+ (ADBMediaSettings *) mediaCreateSettingsWithName:(NSString *)name
length:(double)length
playerName:(NSString *)playerName
playerID:(NSString *)playerID;
length:(double)length
playerName:(NSString *)playerName
playerID:(NSString *)playerID;

/**
* @brief Creates an ADBMediaSettings populated with the parameters.
Expand All @@ -304,8 +304,8 @@ typedef NS_ENUM(NSUInteger, ADBMobilePrivacyStatus) {
+ (ADBMediaSettings *) mediaAdCreateSettingsWithName:(NSString *)name
length:(double)length
playerName:(NSString *)playerName
parentName:(NSString *)parentName
parentPod:(NSString *)parentPod
parentName:(NSString *)parentName
parentPod:(NSString *)parentPod
parentPodPosition:(double)parentPodPosition
CPM:(NSString *)CPM;

Expand All @@ -315,7 +315,7 @@ typedef NS_ENUM(NSUInteger, ADBMobilePrivacyStatus) {
* @param callback a block pointer to call with an ADBMediaState pointer every second.
*/
+ (void) mediaOpenWithSettings:(ADBMediaSettings *)settings
callback:(void (^)(ADBMediaState *mediaState))callback;
callback:(void (^)(ADBMediaState *mediaState))callback;

/**
* @brief Closes a media item.
Expand Down Expand Up @@ -401,6 +401,18 @@ typedef NS_ENUM(NSUInteger, ADBMobilePrivacyStatus) {
*/
+ (void) targetClearCookies;

/**
* @brief Gets the value of the PcID cookie returned for this visitor by the Target server
* @return An NSString pointer containing the PcID for this user
*/
+ (NSString *) targetPcID;

/**
* @brief Gets the value of the SessionID cookie returned for this visitor by the Target server
* @return An NSString pointer containing the SessionID for this user
*/
+ (NSString *) targetSessionID;

#pragma mark - Audience Manager

/**
Expand Down
Binary file modified sdks/iOS/AdobeMobileLibrary/AdobeMobileLibrary.a
Binary file not shown.
Binary file modified sdks/iOS/AdobeMobileLibrary/AdobeMobileLibrary_Extension.a
Binary file not shown.
Binary file modified sdks/iOS/AdobeMobileLibrary/AdobeMobileLibrary_TV.a
Binary file not shown.
Binary file modified sdks/iOS/AdobeMobileLibrary/AdobeMobileLibrary_Watch.a
Binary file not shown.
4 changes: 4 additions & 0 deletions sdks/iOS/ReleaseNotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ Included are notes from the latest major revision to current.
For full SDK documentation, please visit:
https://marketing.adobe.com/resources/help/en_US/mobile/ios/

4.7.1 (23 Oct, 2015)
- Target - Added methods to retrieve PCID and SessionID for user
- Target - Fixed a bug with cookie handling

4.7.0 (15 Oct, 2015)
- New Feature - TvOS compatibility
- In App Messaging - Fixed a bug causing a crash for alert message types when no confirm button text was provided
Expand Down

0 comments on commit a448d40

Please sign in to comment.