diff --git a/Adjust/ADJAppStoreSubscription.h b/Adjust/ADJAppStoreSubscription.h index f4ac744d2..b50e087db 100644 --- a/Adjust/ADJAppStoreSubscription.h +++ b/Adjust/ADJAppStoreSubscription.h @@ -10,26 +10,23 @@ @interface ADJAppStoreSubscription : NSObject -@property (nonatomic, copy, readonly, nonnull) NSDecimalNumber *price; // [M] revenue +@property (nonatomic, copy, readonly, nonnull) NSDecimalNumber *price; -@property (nonatomic, copy, readonly, nonnull) NSString *currency; // [M] currency +@property (nonatomic, copy, readonly, nonnull) NSString *currency; -@property (nonatomic, copy, readonly, nonnull) NSString *transactionId; // [M] transaction_id +@property (nonatomic, copy, readonly, nonnull) NSString *transactionId; -@property (nonatomic, copy, readonly, nonnull) NSData *receipt; // [M] receipt +@property (nonatomic, copy, readonly, nonnull) NSDate *transactionDate; -@property (nonatomic, copy, readonly, nonnull) NSDate *transactionDate; // [O] transaction_date +@property (nonatomic, copy, readonly, nonnull) NSString *salesRegion; -@property (nonatomic, copy, readonly, nonnull) NSString *salesRegion; // [O] sales_region +@property (nonatomic, copy, readonly, nonnull) NSDictionary *callbackParameters; -@property (nonatomic, copy, readonly, nonnull) NSDictionary *callbackParameters; // [O] callback_params - -@property (nonatomic, copy, readonly, nonnull) NSDictionary *partnerParameters; // [O] partner_params +@property (nonatomic, copy, readonly, nonnull) NSDictionary *partnerParameters; - (nullable id)initWithPrice:(nonnull NSDecimalNumber *)price currency:(nonnull NSString *)currency - transactionId:(nonnull NSString *)transactionId - receipt:(nonnull NSData *)receipt; + transactionId:(nonnull NSString *)transactionId; - (void)setTransactionDate:(nonnull NSDate *)transactionDate; diff --git a/Adjust/ADJAppStoreSubscription.m b/Adjust/ADJAppStoreSubscription.m index 1219a276d..939e3ba04 100644 --- a/Adjust/ADJAppStoreSubscription.m +++ b/Adjust/ADJAppStoreSubscription.m @@ -24,8 +24,7 @@ @implementation ADJAppStoreSubscription - (nullable id)initWithPrice:(nonnull NSDecimalNumber *)price currency:(nonnull NSString *)currency - transactionId:(nonnull NSString *)transactionId - receipt:(nonnull NSData *)receipt { + transactionId:(nonnull NSString *)transactionId { self = [super init]; if (self == nil) { return nil; @@ -34,7 +33,6 @@ - (nullable id)initWithPrice:(nonnull NSDecimalNumber *)price _price = [price copy]; _currency = [currency copy]; _transactionId = [transactionId copy]; - _receipt = [receipt copy]; _logger = ADJAdjustFactory.logger; @@ -128,7 +126,6 @@ - (id)copyWithZone:(NSZone *)zone { copy->_price = [self.price copyWithZone:zone]; copy->_currency = [self.currency copyWithZone:zone]; copy->_transactionId = [self.transactionId copyWithZone:zone]; - copy->_receipt = [self.receipt copyWithZone:zone]; copy->_transactionDate = [self.transactionDate copyWithZone:zone]; copy->_salesRegion = [self.salesRegion copyWithZone:zone]; copy.mutableCallbackParameters = [self.mutableCallbackParameters copyWithZone:zone]; diff --git a/Adjust/ADJPurchaseVerificationResult.h b/Adjust/ADJPurchaseVerificationResult.h index 3e8f40409..13c85593d 100644 --- a/Adjust/ADJPurchaseVerificationResult.h +++ b/Adjust/ADJPurchaseVerificationResult.h @@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @property message * - * @brief Text message about current state of receipt verification. + * @brief Text message about current state of purchase verification. */ @property (nonatomic, copy) NSString *message; @@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN /** * @property verificationStatus * - * @brief State of verification (success / failure / unknown / not verified) + * @brief State of purchase verification (success / failure / unknown / not verified) */ @property (nonatomic, copy) NSString *verificationStatus; diff --git a/Adjust/Internal/ADJPackageBuilder.m b/Adjust/Internal/ADJPackageBuilder.m index cfcd1f387..83e7e294b 100644 --- a/Adjust/Internal/ADJPackageBuilder.m +++ b/Adjust/Internal/ADJPackageBuilder.m @@ -926,8 +926,6 @@ - (NSMutableDictionary *)getSubscriptionParameters:(ADJAppStoreSubscription *)su [ADJPackageBuilder parameters:parameters setNumber:subscription.price forKey:@"revenue"]; [ADJPackageBuilder parameters:parameters setString:subscription.currency forKey:@"currency"]; [ADJPackageBuilder parameters:parameters setString:subscription.transactionId forKey:@"transaction_id"]; - // [ADJPackageBuilder parameters:parameters setString:[subscription.receipt adjEncodeBase64] forKey:@"receipt"]; - [ADJPackageBuilder parameters:parameters setString:[ADJAdditions adjEncodeBase64:subscription.receipt] forKey:@"receipt"]; [ADJPackageBuilder parameters:parameters setDate:subscription.transactionDate forKey:@"transaction_date"]; [ADJPackageBuilder parameters:parameters setString:subscription.salesRegion forKey:@"sales_region"]; diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m index 3de0a1dec..fe3118430 100644 --- a/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m +++ b/AdjustTests/AdjustTestApp/AdjustTestApp/ATAAdjustCommandExecutor.m @@ -632,7 +632,6 @@ - (void)trackAppStoreSubscription:(NSDictionary *)parameters { NSDecimalNumber *price; NSString *currency; NSString *transactionId; - NSData *receipt; NSDate *transactionDate; NSString *salesRegion; @@ -645,10 +644,6 @@ - (void)trackAppStoreSubscription:(NSDictionary *)parameters { if ([parameters objectForKey:@"transactionId"]) { transactionId = [parameters objectForKey:@"transactionId"][0]; } - if ([parameters objectForKey:@"receipt"]) { - NSString *receiptString = [parameters objectForKey:@"receipt"][0]; - receipt = [receiptString dataUsingEncoding:NSUTF8StringEncoding]; - } if ([parameters objectForKey:@"transactionDate"]) { transactionDate = [NSDate dateWithTimeIntervalSince1970:[[parameters objectForKey:@"transactionDate"][0] doubleValue]]; } @@ -659,8 +654,7 @@ - (void)trackAppStoreSubscription:(NSDictionary *)parameters { ADJAppStoreSubscription *subscription = [[ADJAppStoreSubscription alloc] initWithPrice:price currency:currency - transactionId:transactionId - receipt:receipt]; + transactionId:transactionId]; [subscription setTransactionDate:transactionDate]; [subscription setSalesRegion:salesRegion];