invoke onProductPurchased on the main thread

Author: serggl

library/build.gradle

@@ -66,7 +66,7 @@ afterEvaluate {
 
                 groupId = 'com.anjlab.android.iab.v3'
                 artifactId = 'library'
-                version = '2.0.0.1'
+                version = '2.0.1'
 
                 pom {
                     name = 'Android In-App Billing v3 Library'

library/src/main/java/com/anjlab/android/iab/v3/BillingProcessor.java

@@ -720,7 +720,7 @@ private void handleOwnedPurchaseTransaction(String productId)
 				details = getSubscriptionPurchaseInfo(productId);
 			}
 
-			eventHandler.onProductPurchased(productId, details);
+			reportProductPurchased(productId, details);
 		}
 	}
 
@@ -994,7 +994,7 @@ private void verifyAndCachePurchase(Purchase purchase)
 					PurchaseInfo purchaseInfo = new PurchaseInfo(purchaseData,
 																 dataSignature,
 																 getPurchasePayload());
-					eventHandler.onProductPurchased(productId, purchaseInfo);
+					reportProductPurchased(productId, purchaseInfo);
 				}
 			}
 			else
@@ -1005,7 +1005,7 @@ private void verifyAndCachePurchase(Purchase purchase)
 		}
 		catch (Exception e)
 		{
-			Log.e(LOG_TAG, "Error in handleActivityResult", e);
+			Log.e(LOG_TAG, "Error in verifyAndCachePurchase", e);
 			reportBillingError(Constants.BILLING_ERROR_OTHER_ERROR, e);
 		}
 		savePurchasePayload(null);
@@ -1058,54 +1058,33 @@ private String getPurchasePayload()
 
 	private void reportBillingError(int errorCode, Throwable error)
 	{
-		if (eventHandler != null)
+		if (eventHandler != null && handler != null)
 		{
-			eventHandler.onBillingError(errorCode, error);
+			handler.post(() -> eventHandler.onBillingError(errorCode, error));
 		}
 	}
 
 	private void reportPurchasesSuccess(final IPurchasesResponseListener listener)
 	{
 		if (listener != null && handler != null)
 		{
-			handler.post(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					listener.onPurchasesSuccess();
-				}
-			});
+			handler.post(() -> listener.onPurchasesSuccess());
 		}
 	}
 
 	private void reportPurchasesError(final IPurchasesResponseListener listener)
 	{
 		if (listener != null && handler != null)
 		{
-			handler.post(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					listener.onPurchasesError();
-				}
-			});
+			handler.post(() -> listener.onPurchasesError());
 		}
 	}
 
 	private void reportSkuDetailsErrorCaller(final String error, final ISkuDetailsResponseListener listener)
 	{
 		if (listener != null && handler != null)
 		{
-			handler.post(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					listener.onSkuDetailsError(error);
-				}
-			});
+			handler.post(() -> listener.onSkuDetailsError(error));
 		}
 	}
 
@@ -1114,17 +1093,17 @@ private void reportSkuDetailsResponseCaller(@Nullable final List<SkuDetails> pro
 	{
 		if (listener != null && handler != null)
 		{
-			handler.post(new Runnable()
-			{
-				@Override
-				public void run()
-				{
-					listener.onSkuDetailsResponse(products);
-				}
-			});
+			handler.post(() -> listener.onSkuDetailsResponse(products));
 		}
 	}
 
+	private void reportProductPurchased(@NonNull String productId, @Nullable PurchaseInfo details)
+	{
+		if (eventHandler != null && handler != null)
+		{
+			handler.post(() -> eventHandler.onProductPurchased(productId, details));
+		}
+	}
 
 	private void handlePurchase(final Purchase purchase)
 	{

library/src/main/java/com/anjlab/android/iab/v3/Constants.java

@@ -48,7 +48,6 @@ public class Constants
 
 	@Deprecated
 	public static final int BILLING_ERROR_LOST_CONTEXT = 103;
-	public static final int BILLING_ERROR_INVALID_DEVELOPER_PAYLOAD = 105;
 	public static final int BILLING_ERROR_PRODUCT_ID_NOT_SPECIFIED = 106;
 	public static final int BILLING_ERROR_OTHER_ERROR = 110;
 	public static final int BILLING_ERROR_CONSUME_FAILED = 111;