Skip to content
This repository was archived by the owner on May 5, 2020. It is now read-only.

Commit

Permalink
Update library to 2.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryant Luk committed Jan 11, 2016
1 parent 82d1d08 commit efcfab9
Show file tree
Hide file tree
Showing 22 changed files with 135 additions and 124 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The PayPalMobile header files and the PayPal iOS SDK Sample App are released under the BSD License:

Copyright (c) 2014, PayPal
Copyright (c) 2014-2016 PayPal, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion PayPal-iOS-SDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'PayPal-iOS-SDK'
spec.version = '2.12.9'
spec.version = '2.13.0'
spec.license = { type: 'BSD', file: 'LICENSE.md' }
spec.homepage = 'https://developer.paypal.com/webapps/developer/docs/integration/mobile/mobile-sdk-overview/'
spec.authors = { 'PayPal' => 'support@paypal.com' }
Expand Down
22 changes: 11 additions & 11 deletions PayPalMobile/PayPalConfiguration.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// PayPalConfiguration.h
//
// Version 2.12.9
// Version 2.13.0
//
// Copyright (c) 2014, PayPal
// Copyright (c) 2014-2016 PayPal, Inc. All rights reserved.
// All rights reserved.
//

Expand All @@ -22,28 +22,28 @@ typedef NS_ENUM(NSInteger, PayPalShippingAddressOption) {
/// Optional default user email address to be shown on the PayPal login view.
/// Will be overridden by email used in most recent PayPal login.
/// @see forceDefaultsInSandbox
@property(nonatomic, copy, readwrite) NSString *defaultUserEmail;
@property(nullable, nonatomic, copy, readwrite) NSString *defaultUserEmail;
/// Optional default user phone country code used in the PayPal login view.
/// The input to this method is expected to be a digit string.
/// For example: `@"1"` for North America, `@"44"` for UK
/// Will be overridden by phone country code used in most recent PayPal login.
/// @see forceDefaultsInSandbox
@property(nonatomic, copy, readwrite) NSString *defaultUserPhoneCountryCode;
@property(nullable, nonatomic, copy, readwrite) NSString *defaultUserPhoneCountryCode;
/// Optional default user phone number to be shown in the PayPal login view.
/// Will be overridden by phone number used in most recent PayPal login.
/// @note If you set defaultUserPhoneNumber, be sure to also set defaultUserPhoneCountryCode.
/// @see forceDefaultsInSandbox
@property(nonatomic, copy, readwrite) NSString *defaultUserPhoneNumber;
@property(nullable, nonatomic, copy, readwrite) NSString *defaultUserPhoneNumber;

/// Your company name, as it should be displayed to the user
/// when requesting consent via a PayPalFuturePaymentViewController or a PayPalProfileSharingViewController.
@property(nonatomic, copy, readwrite) NSString *merchantName;
@property(nullable, nonatomic, copy, readwrite) NSString *merchantName;
/// URL of your company's privacy policy, which will be offered to the user
/// when requesting consent via a PayPalFuturePaymentViewController or a PayPalProfileSharingViewController.
@property(nonatomic, copy, readwrite) NSURL *merchantPrivacyPolicyURL;
@property(nullable, nonatomic, copy, readwrite) NSURL *merchantPrivacyPolicyURL;
/// URL of your company's user agreement, which will be offered to the user
/// when requesting consent via a PayPalFuturePaymentViewController or a PayPalProfileSharingViewController.
@property(nonatomic, copy, readwrite) NSURL *merchantUserAgreementURL;
@property(nullable, nonatomic, copy, readwrite) NSURL *merchantUserAgreementURL;

/// If set to NO, the SDK will only support paying with PayPal, not with credit cards.
/// This applies only to single payments (via PayPalPaymentViewController).
Expand Down Expand Up @@ -88,7 +88,7 @@ typedef NS_ENUM(NSInteger, PayPalShippingAddressOption) {
///
/// These localizations are currently included:
/// ar,da,de,en,en_AU,en_GB,es,es_MX,fr,he,it,ja,ko,ms,nb,nl,pl,pt,pt_BR,ru,sv,th,tr,zh-Hans,zh-Hant,zh-Hant_TW.
@property(nonatomic, copy, readwrite) NSString *languageOrLocale;
@property(nullable, nonatomic, copy, readwrite) NSString *languageOrLocale;

/// If set to YES, then all displayed payment amounts will include a currency code (e.g., "USD")
/// in addition to the standard currency symbol (e.g., "$").
Expand Down Expand Up @@ -123,8 +123,8 @@ typedef NS_ENUM(NSInteger, PayPalShippingAddressOption) {
@property (nonatomic, assign, readwrite) BOOL forceDefaultsInSandbox;

/// Password to use for sandbox if 'forceDefaultsInSandbox' is set.
@property (nonatomic, copy, readwrite) NSString* sandboxUserPassword;
@property (nullable, nonatomic, copy, readwrite) NSString* sandboxUserPassword;
/// PIN to use for sandbox if 'forceDefaultsInSandbox' is set.
@property (nonatomic, copy, readwrite) NSString* sandboxUserPin;
@property (nullable, nonatomic, copy, readwrite) NSString* sandboxUserPin;

@end
20 changes: 10 additions & 10 deletions PayPalMobile/PayPalFuturePaymentViewController.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// PayPalFuturePaymentViewController.h
//
// Version 2.12.9
// Version 2.13.0
//
// Copyright (c) 2014, PayPal
// Copyright (c) 2014-2016 PayPal, Inc. All rights reserved.
// All rights reserved.
//

Expand All @@ -23,7 +23,7 @@ typedef void (^PayPalFuturePaymentDelegateCompletionBlock)(void);
/// User canceled the future payment process.
/// Your code MUST dismiss the PayPalFuturePaymentViewController.
/// @param futurePaymentViewController The PayPalFuturePaymentViewController that the user canceled without agreement.
- (void)payPalFuturePaymentDidCancel:(PayPalFuturePaymentViewController *)futurePaymentViewController;
- (void)payPalFuturePaymentDidCancel:(nonnull PayPalFuturePaymentViewController *)futurePaymentViewController;

/// User successfully completed the future payment authorization.
/// The PayPalFuturePaymentViewController's activity indicator has been dismissed.
Expand All @@ -32,8 +32,8 @@ typedef void (^PayPalFuturePaymentDelegateCompletionBlock)(void);
/// Your code MUST dismiss the PayPalFuturePaymentViewController.
/// @param futurePaymentViewController The PayPalFuturePaymentViewController where the user successfullly authorized.
/// @param futurePaymentAuthorization A dictionary containing information that your server will need to process the payment.
- (void)payPalFuturePaymentViewController:(PayPalFuturePaymentViewController *)futurePaymentViewController
didAuthorizeFuturePayment:(NSDictionary *)futurePaymentAuthorization;
- (void)payPalFuturePaymentViewController:(nonnull PayPalFuturePaymentViewController *)futurePaymentViewController
didAuthorizeFuturePayment:(nonnull NSDictionary *)futurePaymentAuthorization;

@optional
/// User successfully completed the future payment authorization.
Expand All @@ -44,9 +44,9 @@ typedef void (^PayPalFuturePaymentDelegateCompletionBlock)(void);
/// @param futurePaymentViewController The PayPalFuturePaymentViewController where the user successfullly authorized.
/// @param futurePaymentAuthorization A dictionary containing information that your server will need to process the payment.
/// @param completionBlock Block to execute when your processing is done.
- (void)payPalFuturePaymentViewController:(PayPalFuturePaymentViewController *)futurePaymentViewController
willAuthorizeFuturePayment:(NSDictionary *)futurePaymentAuthorization
completionBlock:(PayPalFuturePaymentDelegateCompletionBlock)completionBlock;
- (void)payPalFuturePaymentViewController:(nonnull PayPalFuturePaymentViewController *)futurePaymentViewController
willAuthorizeFuturePayment:(nonnull NSDictionary *)futurePaymentAuthorization
completionBlock:(nonnull PayPalFuturePaymentDelegateCompletionBlock)completionBlock;
@end


Expand All @@ -58,8 +58,8 @@ typedef void (^PayPalFuturePaymentDelegateCompletionBlock)(void);
/// @param configuration The configuration to be used for the lifetime of the controller.
/// The configuration properties merchantName, merchantPrivacyPolicyURL, and merchantUserAgreementURL must be provided.
/// @param delegate The delegate you want to receive updates about the future payment authorization.
- (instancetype)initWithConfiguration:(PayPalConfiguration *)configuration
delegate:(id<PayPalFuturePaymentDelegate>)delegate;
- (nullable instancetype)initWithConfiguration:(nonnull PayPalConfiguration *)configuration
delegate:(nullable id<PayPalFuturePaymentDelegate>)delegate;

/// Delegate access
@property (nonatomic, weak, readonly) id<PayPalFuturePaymentDelegate> futurePaymentDelegate;
Expand Down
20 changes: 10 additions & 10 deletions PayPalMobile/PayPalMobile.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// PayPalMobile.h
//
// Version 2.12.9
// Version 2.13.0
//
// Copyright (c) 2014, PayPal
// Copyright (c) 2014-2016 PayPal, Inc. All rights reserved.
// All rights reserved.
//

Expand All @@ -18,11 +18,11 @@

/// Production (default): Normal, live environment. Real money gets moved.
/// This environment MUST be used for App Store submissions.
extern NSString *const PayPalEnvironmentProduction;
extern NSString * _Nonnull const PayPalEnvironmentProduction;
/// Sandbox: Uses the PayPal sandbox for transactions. Useful for development.
extern NSString *const PayPalEnvironmentSandbox;
extern NSString * _Nonnull const PayPalEnvironmentSandbox;
/// NoNetwork: Mock mode. Does not submit transactions to PayPal. Fakes successful responses. Useful for unit tests.
extern NSString *const PayPalEnvironmentNoNetwork;
extern NSString * _Nonnull const PayPalEnvironmentNoNetwork;

@interface PayPalMobile : NSObject

Expand All @@ -35,7 +35,7 @@ extern NSString *const PayPalEnvironmentNoNetwork;
/// For example,
/// @{PayPalEnvironmentProduction : @"my-client-id-for-Production",
/// PayPalEnvironmentSandbox : @"my-client-id-for-Sandbox"}
+ (void)initializeWithClientIdsForEnvironments:(NSDictionary *)clientIdsForEnvironments;
+ (void)initializeWithClientIdsForEnvironments:(nonnull NSDictionary *)clientIdsForEnvironments;

/// You MUST preconnect to PayPal to prepare the device for processing payments.
/// This improves the user experience because it allows the PayPal Mobile SDK to make its
Expand All @@ -51,7 +51,7 @@ extern NSString *const PayPalEnvironmentNoNetwork;
/// @param environment
/// The PayPal Mobile SDK can operate in different environments to facilitate development and testing.
/// See PayPalEnvironmentProduction, PayPalEnvironmentSandbox, PayPalEnvironmentNoNetwork for more details.
+ (void)preconnectWithEnvironment:(NSString *)environment;
+ (void)preconnectWithEnvironment:(nonnull NSString *)environment;

/// Once a user has consented to future payments, when the user subsequently initiates a PayPal payment
/// from their device to be completed by your server, PayPal uses a Client Metadata ID to verify that the
Expand All @@ -61,10 +61,10 @@ extern NSString *const PayPalEnvironmentNoNetwork;
/// Pass the result to your server, to include in the payment request sent to PayPal.
/// Do not otherwise cache or store this value.
/// @return clientMetadataID Your server will send this to PayPal in a 'PayPal-Client-Metadata-Id' header.
+ (NSString *)clientMetadataID;
+ (nonnull NSString *)clientMetadataID;

/// Method deprecated. Use clientMetadataID instead
+ (NSString *)applicationCorrelationIDForEnvironment:(NSString *)environment __attribute__((deprecated("Use clientMetadataID instead.")));
+ (nonnull NSString *)applicationCorrelationIDForEnvironment:(nonnull NSString *)environment __attribute__((deprecated("Use clientMetadataID instead.")));

/// Delete all previously remembered user data (credit card, email, phone, PayPal account),
/// for all environments. (See PayPalEnvironmentProduction, PayPalEnvironmentSandbox, PayPalEnvironmentNoNetwork.)
Expand All @@ -77,6 +77,6 @@ extern NSString *const PayPalEnvironmentNoNetwork;

/// @return The version of the PayPal Mobile SDK in use. Version numbering follows http://semver.org/.
/// @note Please be sure to include this library version in tech support requests.
+ (NSString *)libraryVersion;
+ (nonnull NSString *)libraryVersion;

@end
18 changes: 9 additions & 9 deletions PayPalMobile/PayPalOAuthScopes.h
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
//
// PayPalOAuthScopes.h
//
// Version 2.12.9
// Version 2.13.0
//
// Copyright (c) 2014, PayPal
// Copyright (c) 2014-2016 PayPal, Inc. All rights reserved.
// All rights reserved.
//

// Currently available scope-values to which the user can be asked to consent.
// @see https://developer.paypal.com/docs/integration/direct/identity/attributes/ for more details

/// Authorize charges for future purchases paid for with PayPal.
extern NSString *const kPayPalOAuth2ScopeFuturePayments;
extern NSString * _Nonnull const kPayPalOAuth2ScopeFuturePayments;
/// Share basic account information.
extern NSString *const kPayPalOAuth2ScopeProfile;
extern NSString * _Nonnull const kPayPalOAuth2ScopeProfile;
/// Basic Authentication.
extern NSString *const kPayPalOAuth2ScopeOpenId;
extern NSString * _Nonnull const kPayPalOAuth2ScopeOpenId;
/// Share your personal and account information.
extern NSString *const kPayPalOAuth2ScopePayPalAttributes;
extern NSString * _Nonnull const kPayPalOAuth2ScopePayPalAttributes;
/// Share your email address.
extern NSString *const kPayPalOAuth2ScopeEmail;
extern NSString * _Nonnull const kPayPalOAuth2ScopeEmail;
/// Share your account address.
extern NSString *const kPayPalOAuth2ScopeAddress;
extern NSString * _Nonnull const kPayPalOAuth2ScopeAddress;
/// Share your phone number.
extern NSString *const kPayPalOAuth2ScopePhone;
extern NSString * _Nonnull const kPayPalOAuth2ScopePhone;

Loading

0 comments on commit efcfab9

Please sign in to comment.