Use TaskCompletionSource instead of while waiting method

manjav · manjav · commit 000bd9c35228 · 2022-02-14T14:25:54.000+03:30
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/ConnectionCallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/ConnectionCallbackProxy.cs
@@ -1,25 +1,29 @@
 using Bazaar.Data;
 using Bazaar.Callbacks;
+using System.Threading.Tasks;
 
 namespace Bazaar.Poolakey.Callbacks
 {
     public class ConnectionCallbackProxy : CallbackProxy<bool>
     {
-        public ConnectionCallbackProxy() : base("com.farsitel.bazaar.callback.ConnectionCallback") { }
+        public ConnectionCallbackProxy() : base("com.farsitel.bazaar.callback.ConnectionCallback")
+        {
+            taskCompletionSource = new TaskCompletionSource<Result<bool>>();
+        }
 
         void onConnect()
         {
-            result = new Result<bool>(Status.Success, "Connection Succeed.") { data = true };
+            taskCompletionSource.SetResult(new Result<bool>(Status.Success, "Connection Succeed.") { data = true });
         }
 
         void onDisconnect()
         {
-            result = new Result<bool>(Status.Disconnected, "Connection Disconnect.") { data = false };
+            taskCompletionSource.SetResult(new Result<bool>(Status.Disconnected, "Connection Disconnect.") { data = false });
         }
 
         void onFailure(string message, string stackTrace)
         {
-            result = new Result<bool>(Status.Failure, message, stackTrace) { data = false };
+            taskCompletionSource.SetResult(new Result<bool>(Status.Failure, message, stackTrace) { data = false });
         }
     }
 }
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/ConsumeCallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/ConsumeCallbackProxy.cs
@@ -1,20 +1,24 @@
 using Bazaar.Data;
 using Bazaar.Callbacks;
+using System.Threading.Tasks;
 
 namespace Bazaar.Poolakey.Callbacks
 {
     public class ConsumeCallbackProxy : CallbackProxy<bool>
     {
-        public ConsumeCallbackProxy() : base("com.farsitel.bazaar.callback.ConsumeCallback") { }
+        public ConsumeCallbackProxy() : base("com.farsitel.bazaar.callback.ConsumeCallback")
+        {
+            taskCompletionSource = new TaskCompletionSource<Result<bool>>();
+        }
 
         void onSuccess()
         {
-            result = new Result<bool>(Status.Success, "Consumption Succeed.") { data = true };
+            taskCompletionSource.SetResult(new Result<bool>(Status.Success, "Consumption Succeed.") { data = true });
         }
 
         void onFailure(string message, string stackTrace)
         {
-            result = new Result<bool>(Status.Failure, message, stackTrace) { data = false };
+            taskCompletionSource.SetResult(new Result<bool>(Status.Failure, message, stackTrace) { data = false });
         }
     }
 }
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/PaymentCallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/PaymentCallbackProxy.cs
@@ -2,6 +2,7 @@
 using Bazaar.Data;
 using Bazaar.Callbacks;
 using Bazaar.Poolakey.Data;
+using System.Threading.Tasks;
 
 namespace Bazaar.Poolakey.Callbacks
 {
@@ -12,6 +13,7 @@ public class PaymentCallbackProxy : CallbackProxy<PurchaseInfo>
         public PaymentCallbackProxy(Action<Result<PurchaseInfo>> onStartAction) : base("com.farsitel.bazaar.callback.PaymentCallback")
         {
             this.onStartAction = onStartAction;
+            taskCompletionSource = new TaskCompletionSource<Result<PurchaseInfo>>();
         }
 
         void onStart()
@@ -21,18 +23,18 @@ void onStart()
 
         void onCancel()
         {
-            result = new Result<PurchaseInfo>(Status.Canceled, null, "Purchase flow canceled.");
+            taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Canceled, null, "Purchase flow canceled."));
         }
 
         void onSuccess(string orderId, string purchaseToken, string payload, string packageName, int purchaseState, long purchaseTime, string productId, string originalJson, string dataSignature)
         {
             var purchase = new PurchaseInfo { orderId = orderId, purchaseToken = purchaseToken, payload = payload, packageName = packageName, purchaseState = (PurchaseInfo.State)purchaseState, purchaseTime = purchaseTime, productId = productId, originalJson = originalJson, dataSignature = dataSignature };
-            result = new Result<PurchaseInfo>(Status.Success, "Purchase Succeed.") { data = purchase };
+            taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Success, "Purchase Succeed.") { data = purchase });
         }
 
         void onFailure(string message, string stackTrace)
         {
-            result = new Result<PurchaseInfo>(Status.Failure, message, stackTrace);
+            taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Failure, message, stackTrace));
         }
     }
 }
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/PurchasesCallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/PurchasesCallbackProxy.cs
@@ -3,12 +3,15 @@
 using Bazaar.Callbacks;
 using Bazaar.Poolakey.Data;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Bazaar.Poolakey.Callbacks
 {
     public class PurchasesCallbackProxy : CallbackProxy<List<PurchaseInfo>>
     {
-        public PurchasesCallbackProxy() : base("com.farsitel.bazaar.callback.PurchasesCallback") { }
+        public PurchasesCallbackProxy() : base("com.farsitel.bazaar.callback.PurchasesCallback") { 
+            taskCompletionSource = new TaskCompletionSource<Result<List<PurchaseInfo>>>();
+        }
 
         void onSuccess(AndroidJavaObject purchaseEntity)
         {
@@ -18,12 +21,12 @@ void onSuccess(AndroidJavaObject purchaseEntity)
             {
                 list.Add(new PurchaseInfo(purchaseEntity.Call<AndroidJavaObject>("get", index)));
             }
-            result = new Result<List<PurchaseInfo>>(Status.Success, "Get purchases completed.") { data = list };
+            taskCompletionSource.SetResult(new Result<List<PurchaseInfo>>(Status.Success, "Get purchases completed.") { data = list });
         }
 
         void onFailure(string message, string stackTrace)
         {
-            result = new Result<List<PurchaseInfo>>(Status.Failure, message, stackTrace);
+            taskCompletionSource.SetResult(new Result<List<PurchaseInfo>>(Status.Failure, message, stackTrace));
         }
     }
 }
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/SKUDetailsCallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Callbacks/SKUDetailsCallbackProxy.cs
@@ -3,12 +3,16 @@
 using Bazaar.Callbacks;
 using Bazaar.Poolakey.Data;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Bazaar.Poolakey.Callbacks
 {
     public class SKUDetailsCallbackProxy : CallbackProxy<List<SKUDetails>>
     {
-        public SKUDetailsCallbackProxy() : base("com.farsitel.bazaar.callback.SKUDetailsCallback") { }
+        public SKUDetailsCallbackProxy() : base("com.farsitel.bazaar.callback.SKUDetailsCallback")
+        {
+            taskCompletionSource = new TaskCompletionSource<Result<List<SKUDetails>>>();
+        }
 
         void onSuccess(AndroidJavaObject purchaseEntity)
         {
@@ -18,12 +22,12 @@ void onSuccess(AndroidJavaObject purchaseEntity)
             {
                 list.Add(new SKUDetails(purchaseEntity.Call<AndroidJavaObject>("get", index)));
             }
-            result = new Result<List<SKUDetails>>(Status.Success, "Fetch SKU details completed.") { data = list };
+            taskCompletionSource.SetResult(new Result<List<SKUDetails>>(Status.Success, "Fetch SKU details completed.") { data = list });
         }
 
         void onFailure(string message, string stackTrace)
         {
-            result = new Result<List<SKUDetails>>(Status.Failure, message, stackTrace);
+            taskCompletionSource.SetResult(new Result<List<SKUDetails>>(Status.Failure, message, stackTrace));
         }
     }
 }
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Payment.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Scripts/Payment.cs
@@ -22,7 +22,7 @@ public async Task<Result<bool>> Connect(Action<Result<bool>> onComplete = null)
             {
                 var callback = new ConnectionCallbackProxy();
                 bridge.Call("connect", paymentConfiguration.securityCheck.rsaPublicKey, callback);
-                result = await callback.WaitForResult();
+                result = await callback.taskCompletionSource.Task;
             }
             else
             {
@@ -46,7 +46,7 @@ public async Task<Result<List<SKUDetails>>> GetSkuDetails(string productIds, SKU
             {
                 var callback = new SKUDetailsCallbackProxy();
                 bridge.Call("getSkuDetails", type.ToString(), productIds, callback);
-                result = await callback.WaitForResult();
+                result = await callback.taskCompletionSource.Task;
             }
             else
             {
@@ -63,7 +63,7 @@ public async Task<Result<List<PurchaseInfo>>> GetPurchases(SKUDetails.Type type
             {
                 var callback = new PurchasesCallbackProxy();
                 bridge.Call("getPurchases", type.ToString(), callback);
-                result = await callback.WaitForResult();
+                result = await callback.taskCompletionSource.Task;
             }
             else
             {
@@ -80,7 +80,7 @@ public async Task<Result<PurchaseInfo>> Purchase(string productId, SKUDetails.Ty
             {
                 var callback = new PaymentCallbackProxy(onStart);
                 bridge.Call("purchase", type.ToString(), productId, payload, dynamicPriceToken, callback);
-                result = await callback.WaitForResult();
+                result = await callback.taskCompletionSource.Task;
             }
             else
             {
@@ -92,13 +92,12 @@ public async Task<Result<PurchaseInfo>> Purchase(string productId, SKUDetails.Ty
 
         public async Task<Result<bool>> Consume(string token, Action<Result<bool>> onComplete = null)
         {
-
             Result<bool> result = Result<bool>.GetDefault();
             if (isAndroid)
             {
                 var callback = new ConsumeCallbackProxy();
                 bridge.Call("consume", token, callback);
-                result = await callback.WaitForResult();
+                result = await callback.taskCompletionSource.Task;
             }
             else
             {
diff --git a/poolakeyunitysdk-unity/Assets/Bazaar/Scripts/Callbacks/CallbackProxy.cs b/poolakeyunitysdk-unity/Assets/Bazaar/Scripts/Callbacks/CallbackProxy.cs
@@ -6,14 +6,7 @@ namespace Bazaar.Callbacks
 {
     public class CallbackProxy<T> : AndroidJavaProxy
     {
-        protected Result<T> result;
         public CallbackProxy(string address) : base(address) { }
-
-        public async Task<Result<T>> WaitForResult()
-        {
-            while (result == null)
-                await Task.Delay(100);
-            return (Result<T>)result;
-        }
+        public TaskCompletionSource<Result<T>> taskCompletionSource;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,29 @@`
`1`	`1`	`using Bazaar.Data;`
`2`	`2`	`using Bazaar.Callbacks;`
	`3`	`+using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace Bazaar.Poolakey.Callbacks`
`5`	`6`	`{`
`6`	`7`	`public class ConnectionCallbackProxy : CallbackProxy<bool>`
`7`	`8`	`{`
`8`		`- public ConnectionCallbackProxy() : base("com.farsitel.bazaar.callback.ConnectionCallback") { }`
	`9`	`+ public ConnectionCallbackProxy() : base("com.farsitel.bazaar.callback.ConnectionCallback")`
	`10`	`+ {`
	`11`	`+ taskCompletionSource = new TaskCompletionSource<Result<bool>>();`
	`12`	`+ }`
`9`	`13`
`10`	`14`	`void onConnect()`
`11`	`15`	`{`
`12`		`- result = new Result<bool>(Status.Success, "Connection Succeed.") { data = true };`
	`16`	`+ taskCompletionSource.SetResult(new Result<bool>(Status.Success, "Connection Succeed.") { data = true });`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`void onDisconnect()`
`16`	`20`	`{`
`17`		`- result = new Result<bool>(Status.Disconnected, "Connection Disconnect.") { data = false };`
	`21`	`+ taskCompletionSource.SetResult(new Result<bool>(Status.Disconnected, "Connection Disconnect.") { data = false });`
`18`	`22`	`}`
`19`	`23`
`20`	`24`	`void onFailure(string message, string stackTrace)`
`21`	`25`	`{`
`22`		`- result = new Result<bool>(Status.Failure, message, stackTrace) { data = false };`
	`26`	`+ taskCompletionSource.SetResult(new Result<bool>(Status.Failure, message, stackTrace) { data = false });`
`23`	`27`	`}`
`24`	`28`	`}`
`25`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,24 @@`
`1`	`1`	`using Bazaar.Data;`
`2`	`2`	`using Bazaar.Callbacks;`
	`3`	`+using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace Bazaar.Poolakey.Callbacks`
`5`	`6`	`{`
`6`	`7`	`public class ConsumeCallbackProxy : CallbackProxy<bool>`
`7`	`8`	`{`
`8`		`- public ConsumeCallbackProxy() : base("com.farsitel.bazaar.callback.ConsumeCallback") { }`
	`9`	`+ public ConsumeCallbackProxy() : base("com.farsitel.bazaar.callback.ConsumeCallback")`
	`10`	`+ {`
	`11`	`+ taskCompletionSource = new TaskCompletionSource<Result<bool>>();`
	`12`	`+ }`
`9`	`13`
`10`	`14`	`void onSuccess()`
`11`	`15`	`{`
`12`		`- result = new Result<bool>(Status.Success, "Consumption Succeed.") { data = true };`
	`16`	`+ taskCompletionSource.SetResult(new Result<bool>(Status.Success, "Consumption Succeed.") { data = true });`
`13`	`17`	`}`
`14`	`18`
`15`	`19`	`void onFailure(string message, string stackTrace)`
`16`	`20`	`{`
`17`		`- result = new Result<bool>(Status.Failure, message, stackTrace) { data = false };`
	`21`	`+ taskCompletionSource.SetResult(new Result<bool>(Status.Failure, message, stackTrace) { data = false });`
`18`	`22`	`}`
`19`	`23`	`}`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Bazaar.Data;`
`3`	`3`	`using Bazaar.Callbacks;`
`4`	`4`	`using Bazaar.Poolakey.Data;`
	`5`	`+using System.Threading.Tasks;`
`5`	`6`
`6`	`7`	`namespace Bazaar.Poolakey.Callbacks`
`7`	`8`	`{`
`@@ -12,6 +13,7 @@ public class PaymentCallbackProxy : CallbackProxy<PurchaseInfo>`
`12`	`13`	`public PaymentCallbackProxy(Action<Result<PurchaseInfo>> onStartAction) : base("com.farsitel.bazaar.callback.PaymentCallback")`
`13`	`14`	`{`
`14`	`15`	`this.onStartAction = onStartAction;`
	`16`	`+ taskCompletionSource = new TaskCompletionSource<Result<PurchaseInfo>>();`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`void onStart()`
`@@ -21,18 +23,18 @@ void onStart()`
`21`	`23`
`22`	`24`	`void onCancel()`
`23`	`25`	`{`
`24`		`- result = new Result<PurchaseInfo>(Status.Canceled, null, "Purchase flow canceled.");`
	`26`	`+ taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Canceled, null, "Purchase flow canceled."));`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`void onSuccess(string orderId, string purchaseToken, string payload, string packageName, int purchaseState, long purchaseTime, string productId, string originalJson, string dataSignature)`
`28`	`30`	`{`
`29`	`31`	`var purchase = new PurchaseInfo { orderId = orderId, purchaseToken = purchaseToken, payload = payload, packageName = packageName, purchaseState = (PurchaseInfo.State)purchaseState, purchaseTime = purchaseTime, productId = productId, originalJson = originalJson, dataSignature = dataSignature };`
`30`		`- result = new Result<PurchaseInfo>(Status.Success, "Purchase Succeed.") { data = purchase };`
	`32`	`+ taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Success, "Purchase Succeed.") { data = purchase });`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`void onFailure(string message, string stackTrace)`
`34`	`36`	`{`
`35`		`- result = new Result<PurchaseInfo>(Status.Failure, message, stackTrace);`
	`37`	`+ taskCompletionSource.SetResult(new Result<PurchaseInfo>(Status.Failure, message, stackTrace));`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,15 @@`
`3`	`3`	`using Bazaar.Callbacks;`
`4`	`4`	`using Bazaar.Poolakey.Data;`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Threading.Tasks;`
`6`	`7`
`7`	`8`	`namespace Bazaar.Poolakey.Callbacks`
`8`	`9`	`{`
`9`	`10`	`public class PurchasesCallbackProxy : CallbackProxy<List<PurchaseInfo>>`
`10`	`11`	`{`
`11`		`- public PurchasesCallbackProxy() : base("com.farsitel.bazaar.callback.PurchasesCallback") { }`
	`12`	`+ public PurchasesCallbackProxy() : base("com.farsitel.bazaar.callback.PurchasesCallback") {`
	`13`	`+ taskCompletionSource = new TaskCompletionSource<Result<List<PurchaseInfo>>>();`
	`14`	`+ }`
`12`	`15`
`13`	`16`	`void onSuccess(AndroidJavaObject purchaseEntity)`
`14`	`17`	`{`
`@@ -18,12 +21,12 @@ void onSuccess(AndroidJavaObject purchaseEntity)`
`18`	`21`	`{`
`19`	`22`	`list.Add(new PurchaseInfo(purchaseEntity.Call<AndroidJavaObject>("get", index)));`
`20`	`23`	`}`
`21`		`- result = new Result<List<PurchaseInfo>>(Status.Success, "Get purchases completed.") { data = list };`
	`24`	`+ taskCompletionSource.SetResult(new Result<List<PurchaseInfo>>(Status.Success, "Get purchases completed.") { data = list });`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`void onFailure(string message, string stackTrace)`
`25`	`28`	`{`
`26`		`- result = new Result<List<PurchaseInfo>>(Status.Failure, message, stackTrace);`
	`29`	`+ taskCompletionSource.SetResult(new Result<List<PurchaseInfo>>(Status.Failure, message, stackTrace));`
`27`	`30`	`}`
`28`	`31`	`}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,16 @@`
`3`	`3`	`using Bazaar.Callbacks;`
`4`	`4`	`using Bazaar.Poolakey.Data;`
`5`	`5`	`using System.Collections.Generic;`
	`6`	`+using System.Threading.Tasks;`
`6`	`7`
`7`	`8`	`namespace Bazaar.Poolakey.Callbacks`
`8`	`9`	`{`
`9`	`10`	`public class SKUDetailsCallbackProxy : CallbackProxy<List<SKUDetails>>`
`10`	`11`	`{`
`11`		`- public SKUDetailsCallbackProxy() : base("com.farsitel.bazaar.callback.SKUDetailsCallback") { }`
	`12`	`+ public SKUDetailsCallbackProxy() : base("com.farsitel.bazaar.callback.SKUDetailsCallback")`
	`13`	`+ {`
	`14`	`+ taskCompletionSource = new TaskCompletionSource<Result<List<SKUDetails>>>();`
	`15`	`+ }`
`12`	`16`
`13`	`17`	`void onSuccess(AndroidJavaObject purchaseEntity)`
`14`	`18`	`{`
`@@ -18,12 +22,12 @@ void onSuccess(AndroidJavaObject purchaseEntity)`
`18`	`22`	`{`
`19`	`23`	`list.Add(new SKUDetails(purchaseEntity.Call<AndroidJavaObject>("get", index)));`
`20`	`24`	`}`
`21`		`- result = new Result<List<SKUDetails>>(Status.Success, "Fetch SKU details completed.") { data = list };`
	`25`	`+ taskCompletionSource.SetResult(new Result<List<SKUDetails>>(Status.Success, "Fetch SKU details completed.") { data = list });`
`22`	`26`	`}`
`23`	`27`
`24`	`28`	`void onFailure(string message, string stackTrace)`
`25`	`29`	`{`
`26`		`- result = new Result<List<SKUDetails>>(Status.Failure, message, stackTrace);`
	`30`	`+ taskCompletionSource.SetResult(new Result<List<SKUDetails>>(Status.Failure, message, stackTrace));`
`27`	`31`	`}`
`28`	`32`	`}`
`29`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public async Task<Result<bool>> Connect(Action<Result<bool>> onComplete = null)`
`22`	`22`	`{`
`23`	`23`	`var callback = new ConnectionCallbackProxy();`
`24`	`24`	`bridge.Call("connect", paymentConfiguration.securityCheck.rsaPublicKey, callback);`
`25`		`- result = await callback.WaitForResult();`
	`25`	`+ result = await callback.taskCompletionSource.Task;`
`26`	`26`	`}`
`27`	`27`	`else`
`28`	`28`	`{`
`@@ -46,7 +46,7 @@ public async Task<Result<List<SKUDetails>>> GetSkuDetails(string productIds, SKU`
`46`	`46`	`{`
`47`	`47`	`var callback = new SKUDetailsCallbackProxy();`
`48`	`48`	`bridge.Call("getSkuDetails", type.ToString(), productIds, callback);`
`49`		`- result = await callback.WaitForResult();`
	`49`	`+ result = await callback.taskCompletionSource.Task;`
`50`	`50`	`}`
`51`	`51`	`else`
`52`	`52`	`{`
`@@ -63,7 +63,7 @@ public async Task<Result<List<PurchaseInfo>>> GetPurchases(SKUDetails.Type type`
`63`	`63`	`{`
`64`	`64`	`var callback = new PurchasesCallbackProxy();`
`65`	`65`	`bridge.Call("getPurchases", type.ToString(), callback);`
`66`		`- result = await callback.WaitForResult();`
	`66`	`+ result = await callback.taskCompletionSource.Task;`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`@@ -80,7 +80,7 @@ public async Task<Result<PurchaseInfo>> Purchase(string productId, SKUDetails.Ty`
`80`	`80`	`{`
`81`	`81`	`var callback = new PaymentCallbackProxy(onStart);`
`82`	`82`	`bridge.Call("purchase", type.ToString(), productId, payload, dynamicPriceToken, callback);`
`83`		`- result = await callback.WaitForResult();`
	`83`	`+ result = await callback.taskCompletionSource.Task;`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`@@ -92,13 +92,12 @@ public async Task<Result<PurchaseInfo>> Purchase(string productId, SKUDetails.Ty`
`92`	`92`
`93`	`93`	`public async Task<Result<bool>> Consume(string token, Action<Result<bool>> onComplete = null)`
`94`	`94`	`{`
`95`		`-`
`96`	`95`	`Result<bool> result = Result<bool>.GetDefault();`
`97`	`96`	`if (isAndroid)`
`98`	`97`	`{`
`99`	`98`	`var callback = new ConsumeCallbackProxy();`
`100`	`99`	`bridge.Call("consume", token, callback);`
`101`		`- result = await callback.WaitForResult();`
	`100`	`+ result = await callback.taskCompletionSource.Task;`
`102`	`101`	`}`
`103`	`102`	`else`
`104`	`103`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,7 @@ namespace Bazaar.Callbacks`
`6`	`6`	`{`
`7`	`7`	`public class CallbackProxy<T> : AndroidJavaProxy`
`8`	`8`	`{`
`9`		`- protected Result<T> result;`
`10`	`9`	`public CallbackProxy(string address) : base(address) { }`
`11`		`-`
`12`		`- public async Task<Result<T>> WaitForResult()`
`13`		`- {`
`14`		`- while (result == null)`
`15`		`- await Task.Delay(100);`
`16`		`- return (Result<T>)result;`
`17`		`- }`
	`10`	`+ public TaskCompletionSource<Result<T>> taskCompletionSource;`
`18`	`11`	`}`
`19`	`12`	`}`