Patch clear transaction (#1215)

* Bug Fix clearTransaction promise Added a promise to the clearTransaction function, to wait until it finishes clearing open transactions #1120 * BigFix clearTransaction promise Added a promise to the clearTransaction function, to wait until it finishes clearing open transactions #1120
dooboolab-community · Dec 30, 2020 · c0652db · c0652db
1 parent f620e80
commit c0652db
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/ios/RNIapIos.h b/ios/RNIapIos.h
@@ -8,6 +8,7 @@
   NSMutableArray *validProducts;
   SKPayment *promotedPayment;
   SKProduct *promotedProduct;
+  NSInteger countPendingTransaction;
 }
 @end
 

diff --git a/ios/RNIapIos.m b/ios/RNIapIos.m
@@ -255,11 +255,23 @@ - (BOOL)paymentQueue:(SKPaymentQueue *)queue shouldAddStorePayment:(SKPayment *)
     }
 }
 
-RCT_EXPORT_METHOD(clearTransaction) {
-    NSArray *pendingTrans = [[SKPaymentQueue defaultQueue] transactions];
+RCT_EXPORT_METHOD(clearTransaction:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {  
+
     NSLog(@"\n\n\n  ***  clear remaining Transactions. Call this before make a new transaction   \n\n.");
-    for (int k = 0; k < pendingTrans.count; k++) {
-        [[SKPaymentQueue defaultQueue] finishTransaction:pendingTrans[k]];
+
+    NSArray *pendingTrans = [[SKPaymentQueue defaultQueue] transactions];
+    countPendingTransaction = (NSInteger)(pendingTrans.count);
+
+    if (countPendingTransaction > 0) {
+        [self addPromiseForKey:@"cleaningTransactions" resolve:resolve reject:reject];
+
+        for (SKPaymentTransaction *transaction in pendingTrans) {
+            [[SKPaymentQueue defaultQueue] finishTransaction:transaction];
+        }
+
+    } else {
+        resolve(nil);
     }
 }
 
@@ -814,4 +826,15 @@ - (void)requestDidFinish:(SKRequest *)request {
     }
 }
 
+-(void)paymentQueue:(SKPaymentQueue *)queue removedTransactions:(NSArray *)transactions {
+    NSLog(@"removedTransactions");
+    if (countPendingTransaction != nil && countPendingTransaction > 0) {
+        countPendingTransaction--;
+        if (countPendingTransaction == 0) {
+            [self resolvePromisesForKey:@"cleaningTransactions" value:nil];
+            countPendingTransaction = nil;
+        }
+    }
+}
+
 @end