diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:06:31 +0100 |
commit | b09a037836111a2e11a5c975573c02ba1f52379e (patch) | |
tree | 59a0553bcb7d6cd4cf563f8983033d7a80896854 | |
parent | 993b0ba85c8408d95963a69b39095124bfaabbe3 (diff) | |
parent | 4835a1dcfbbeb19e28965f796f03e79a58159980 (diff) |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Ide30a2773dac19a8acb5da5c4da15e4d192f6132
-rw-r--r-- | src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java index 17fddf7..3ab3d70 100644 --- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java +++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java @@ -123,11 +123,16 @@ public class QtInAppPurchase { Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND"); - serviceIntent.setPackage("com.android.vending.billing"); - if (!m_context.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) { - m_context.bindService(serviceIntent, m_serviceConnection, Context.BIND_AUTO_CREATE); - } else { - Log.e(TAG, "No in-app billing service available."); + serviceIntent.setPackage("com.android.vending"); + try { + if (!m_context.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) { + m_context.bindService(serviceIntent, m_serviceConnection, Context.BIND_AUTO_CREATE); + } else { + Log.e(TAG, "No in-app billing service available."); + purchasedProductsQueried(m_nativePointer); + } + } catch (Exception e) { + Log.e(TAG, "Could not query InAppBillingService intent."); purchasedProductsQueried(m_nativePointer); } } |