v0.1.1

lykhonis · Jan 28, 2018 · 37d04e0 · 37d04e0
1 parent b3e4be9
commit 37d04e0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.1.1] - iOS Support
+Library is tested on iOS. Feature parity for both iOS and Android.
+
 ## [0.1.0] - Billing
 New breaking API to address caching of products and purchases.
 

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ testing has been limited.
 [Pull Requests](https://github.com/VolodymyrLykhonis/flutter_billing/pulls) are welcome.
 
 ## Using
-Add `flutter_billing: 0.1.0` as a dependency in `pubspec.yaml`.
+Add `flutter_billing: 0.1.1` as a dependency in `pubspec.yaml`.
 
 Create an instance of the plugin:
 ```dart
@@ -57,5 +57,4 @@ final bool purchased = await billing.purchase(productId);
 ## Limitations
 This is just an initial version of the plugin. There are still some limitations:
 
-- iOS implementation is currently under testing
 - Only non-consumable in app products are supported
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -443,6 +443,7 @@
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -470,6 +471,7 @@
 				ARCHS = arm64;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/ios/Classes/BillingPlugin.m b/ios/Classes/BillingPlugin.m
@@ -6,7 +6,7 @@ @interface BillingPlugin()
 @property (atomic, retain) NSMutableDictionary<NSValue*, FlutterResult>* fetchProducts;
 @property (atomic, retain) NSMutableDictionary<SKPayment*, FlutterResult>* requestedPayments;
 @property (atomic, retain) NSArray<SKProduct*>* products;
-@property (atomic, retain) NSSet<NSString*>* purchases;
+@property (atomic, retain) NSMutableSet<NSString*>* purchases;
 @property (nonatomic, retain) FlutterMethodChannel* channel;
 
 @end
@@ -36,7 +36,7 @@ - (instancetype)init {
     self.fetchProducts = [[NSMutableDictionary alloc] init];
     self.requestedPayments = [[NSMutableDictionary alloc] init];
     self.products = [[NSArray alloc] init];
-    self.purchases = [[NSSet alloc] init];
+    self.purchases = [[NSMutableSet alloc] init];
 
     return self;
 }
@@ -98,22 +98,22 @@ - (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedW
 - (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue {
     NSArray<FlutterResult>* results = [NSArray arrayWithArray:fetchPurchases];
     [fetchPurchases removeAllObjects];
-    
+
     NSArray<NSString*>* productIdentifiers = [purchases allObjects];
     [results enumerateObjectsUsingBlock:^(FlutterResult result, NSUInteger idx, BOOL* stop) {
         result(productIdentifiers);
     }];
 }
 
 - (void)purchased:(NSArray<SKPaymentTransaction*>*)transactions {
-    NSArray<FlutterResult>* results = [[NSArray alloc] init];
+    NSMutableArray<FlutterResult>* results = [[NSMutableArray alloc] init];
 
     [transactions enumerateObjectsUsingBlock:^(SKPaymentTransaction* transaction, NSUInteger idx, BOOL* stop) {
-        [purchases setByAddingObject:transaction.payment.productIdentifier];
+        [purchases addObject:transaction.payment.productIdentifier];
         FlutterResult result = [requestedPayments objectForKey:transaction.payment];
         if (result != nil) {
             [requestedPayments removeObjectForKey:transaction.payment];
-            [results arrayByAddingObject:result];
+            [results addObject:result];
         }
         [[SKPaymentQueue defaultQueue] finishTransaction:transaction];
     }];
@@ -128,7 +128,7 @@ - (void)restored:(NSArray<SKPaymentTransaction*>*)transactions {
     [transactions enumerateObjectsUsingBlock:^(SKPaymentTransaction* transaction, NSUInteger idx, BOOL* stop) {
         SKPaymentTransaction* original = transaction.originalTransaction;
         if (original != nil) {
-            [purchases setByAddingObject:original.payment.productIdentifier];
+            [purchases addObject:original.payment.productIdentifier];
         }
         [[SKPaymentQueue defaultQueue] finishTransaction:transaction];
     }];
@@ -173,16 +173,19 @@ - (void)fetchProducts:(NSArray<NSString*>*)identifiers result:(FlutterResult)res
 }
 
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error {
-    FlutterResult result = [fetchProducts objectForKey:[NSValue valueWithNonretainedObject:request]];
+    NSValue* key = [NSValue valueWithNonretainedObject:request];
+    FlutterResult result = [fetchProducts objectForKey:key];
     if (result != nil) {
-        [fetchProducts removeObjectForKey:[NSValue valueWithNonretainedObject:request]];
+        [fetchProducts removeObjectForKey:key];
         result([FlutterError errorWithCode:@"ERROR" message:@"Failed to make IAP request!" details:nil]);
     }
 }
 
 - (void)productsRequest:(nonnull SKProductsRequest *)request didReceiveResponse:(nonnull SKProductsResponse *)response {
-    FlutterResult result = [fetchProducts objectForKey:[NSValue valueWithNonretainedObject:request]];
+    NSValue* key = [NSValue valueWithNonretainedObject:request];
+    FlutterResult result = [fetchProducts objectForKey:key];
     if (result == nil) return;
+    [fetchProducts removeObjectForKey:key];
 
     NSNumberFormatter* currencyFormatter = [[NSNumberFormatter alloc] init];
     [currencyFormatter setNumberStyle:NSNumberFormatterCurrencyStyle];

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_billing
 description: A flutter plugin to communicate with billing on iOS and Android.
-version: 0.1.0
+version: 0.1.1
 author: Volodymyr Lykhonis <[email protected]>
 homepage: http://vladimirlichonos.com