witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

continue

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-04-22 11:47:02 +02:00
parent c13e063f3a
commit 7228feec68
5 changed files with 43 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/InAppProductsManager.h
View file

@ -29,6 +29,8 @@ extern NSString *const kLinphoneIAPurchaseNotification;
@interface InAppProductsManager : NSObject <SKProductsRequestDelegate, SKPaymentTransactionObserver>
// startup status, manager is not ready yet.
#define IAPNotReadyYet @"IAPNotReadyYet"
#define IAPAvailableSucceeded @"IAPAvailableSucceeded"
#define IAPAvailableFailed @"IAPAvailableFailed"
#define IAPPurchaseFailed @"IAPPurchaseFailed"

53
Classes/InAppProductsManager.m
View file

@ -64,6 +64,7 @@ NSString *const kLinphoneIAPurchaseNotification = @"LinphoneIAProductsNotificati
- (instancetype)init {
if ((self = [super init]) != nil) {
_xmlrpc = [[InAppProductsXMLRPCDelegate alloc] init];
_status = IAPNotReadyYet;
[[SKPaymentQueue defaultQueue] addTransactionObserver:self];
[self loadProducts];
}
@ -79,8 +80,7 @@ NSString *const kLinphoneIAPurchaseNotification = @"LinphoneIAProductsNotificati
_productsIDPurchased = [[NSMutableArray alloc] initWithCapacity:0];
SKProductsRequest *productsRequest = [[SKProductsRequest alloc]
initWithProductIdentifiers:[NSSet setWithArray:list]];
SKProductsRequest *productsRequest = [[SKProductsRequest alloc] initWithProductIdentifiers:[NSSet setWithArray:list]];
productsRequest.delegate = self;
[productsRequest start];
}
@ -121,6 +121,7 @@ NSString *const kLinphoneIAPurchaseNotification = @"LinphoneIAProductsNotificati
return;
}
}
LOGE(@"Impossible to find product with ID %@...", productID);
[self postNotificationforStatus:IAPPurchaseFailed];
}
@ -129,17 +130,24 @@ NSString *const kLinphoneIAPurchaseNotification = @"LinphoneIAProductsNotificati
[[SKPaymentQueue defaultQueue] restoreCompletedTransactions];
}
static SKRequest* req = nil;
- (void)requestDidFinish:(SKRequest *)request {
if (req == request) {
LOGI(@"Got receipt");
[self checkReceipt:nil];
if([request isKindOfClass:[SKReceiptRefreshRequest class]]) {
NSURL *receiptUrl = [[NSBundle mainBundle] appStoreReceiptURL];
if ([[NSFileManager defaultManager] fileExistsAtPath:[receiptUrl path]]) {
LOGI(@"App Receipt exists");
[self checkReceipt:nil];
} else {
LOGE(@"Receipt request done but there is no receipt");
// This can happen if the user cancels the login screen for the store.
// If we get here it means there is no receipt and an attempt to get it failed because the user cancelled the login.
//[self trackFailedAttempt];
}
}
}
- (void)request:(SKRequest *)skrequest didFailWithError:(NSError *)error {
LOGE(@"Did not get receipt: %@", error);
LOGE(@"Did not get receipt: %@", error.localizedDescription);
[self setStatus:IAPReceiptFailed];
}
@ -147,27 +155,32 @@ static SKRequest* req = nil;
NSData *receiptData = nil;
NSURL *receiptURL = [[NSBundle mainBundle] appStoreReceiptURL];
// Test whether the receipt is present at the above URL
if(![[NSFileManager defaultManager] fileExistsAtPath:[receiptURL path]]) {
if([[NSFileManager defaultManager] fileExistsAtPath:[receiptURL path]]) {
receiptData = [NSData dataWithContentsOfURL:receiptURL];
LOGI(@"Found appstore receipt containing: %@", receiptData);
} else if (req == nil) {
} else {
// We are probably in sandbox environment, trying to retrieve it...
req = [[SKReceiptRefreshRequest alloc] init];
SKRequest* req = [[SKReceiptRefreshRequest alloc] init];
LOGI(@"Receipt not found yet, trying to retrieve it...");
req.delegate = self;
[req start];
} else {
LOGF(@"No receipt found");
return;
}
// We must validate the receipt on our server
NSURL *URL = [NSURL URLWithString:[[LinphoneManager instance] lpConfigStringForKey:@"receipt_validation_url" forSection:@"in_app_purchase"]];
XMLRPCRequest *request = [[XMLRPCRequest alloc] initWithURL: URL];
[request setMethod: @"in_app_receipt_validation" withParameters:[NSArray arrayWithObjects:@"ios", receiptData, nil]];
[request setMethod: @"create_account_from_in_app_purchase" withParameters:[NSArray arrayWithObjects:
@"toto@test.linphone.org",
@"toto",
receiptData,
@"",
@"apple",
nil]];
XMLRPCConnectionManager *manager = [XMLRPCConnectionManager sharedManager];
[manager spawnConnectionWithXMLRPCRequest: request delegate: self.xmlrpc];
LOGE(@"XMLRPC query %@: %@", [request method], [request body]);
[request release];
}
@ -185,7 +198,7 @@ static SKRequest* req = nil;
//waiting for parent approval
break;
case SKPaymentTransactionStateFailed:
_errlast = [NSString stringWithFormat:@"Purchase of %@ failed.",transaction.payment.productIdentifier];
_errlast = [NSString stringWithFormat:@"Purchase of %@ failed: %@.",transaction.payment.productIdentifier,transaction.error.localizedDescription];
LOGE(@"%@", _errlast);
[self completeTransaction:transaction forStatus:IAPPurchaseFailed];
break;
@ -228,11 +241,11 @@ static SKRequest* req = nil;
}
- (void)retrievePurchases {
[self checkReceipt:nil];
LOGE(@"todo");//[self checkReceipt:nil];
}
- (void)XMLRPCRequest:(XMLRPCRequest *)request didReceiveResponse:(XMLRPCResponse *)response {
LOGI(@"XMLRPC %@: %@", [request method], [response body]);
LOGI(@"XMLRPC response %@: %@", [request method], [response body]);
// [waitView setHidden:true];
if ([response isFault]) {
LOGE(@"Communication issue (%@)", [response faultString]);
@ -254,8 +267,7 @@ static SKRequest* req = nil;
// cancelButtonTitle:NSLocalizedString(@"Continue",nil)
// otherButtonTitles:nil,nil];
// [errorView show];
// [errorView release];
[self.productsIDPurchased addObject:@"test.one_time"];
// [errorView release];!
[self postNotificationforStatus:IAPReceiptSucceeded];
return;
}
@ -266,7 +278,6 @@ static SKRequest* req = nil;
- (void)XMLRPCRequest:(XMLRPCRequest *)request didFailWithError:(NSError *)error {
LOGE(@"Communication issue (%@)", [error localizedDescription]);
[self.productsIDPurchased addObject:@"test.one_time"];
// NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Communication issue (%@)", nil), [error localizedDescription]];
// UIAlertView* errorView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Communication issue", nil)
// message:errorString

3
Classes/PhoneMainView.m
View file

@ -419,8 +419,7 @@ static RootViewManager* rootViewManagerInstance = nil;
// Change to default view
const MSList *list = linphone_core_get_proxy_config_list(core);
if(list != NULL || ([lm lpConfigBoolForKey:@"hide_wizard_preference"] == true) || lm.isTesting) {
[self changeCurrentView: [InAppProductsViewController compositeViewDescription]];
[self changeCurrentView: [DialerViewController compositeViewDescription]];
} else {
WizardViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]], WizardViewController);
if(controller != nil) {

8
Resources/linphonerc-factory
View file

@ -56,7 +56,7 @@ display_filter_auto_rotate=0
#contact_filter_on_default_domain=1
[in_app_purchase]
enabled = 1
paid_account_id = test.auto_renew_7days
receipt_validation_url = https://www.linphone.org/inapp.php
products_list = test.auto_renew_7days, test.non_renew, test.one_time, test.auto_renew_1month_withfree
enabled=1
paid_account_id=test.auto_renew_7days
receipt_validation_url=https://www.linphone.org/inapp.php
products_list=test.auto_renew_7days,test.non_renew,test.one_time,test.auto_renew_1month_withfree

8
Resources/linphonerc-factory~ipad
View file

@ -52,7 +52,7 @@ stun=stun.linphone.org
display_filter_auto_rotate=0
[in_app_purchase]
enabled = 1
paid_account_id = test.auto_renew_7days
receipt_validation_url = https://www.linphone.org/inapp.php
products_list = test.auto_renew_7days, test.non_renew, test.one_time, test.auto_renew_1month_withfree
enabled=1
paid_account_id=test.auto_renew_7days
receipt_validation_url=https://www.linphone.org/inapp.php
products_list=test.auto_renew_7days,test.non_renew,test.one_time,test.auto_renew_1month_withfree