Merge pull request #5 from CFPrulez/patch-1

prevent NullPointerException in IabHelper
DSteve595 · Mar 16, 2016 · f9ae76f · f9ae76f
2 parents 2bff39a + 28b3069
commit f9ae76f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/billing/IabHelper.java b/Emoji Switcher/src/main/java/com/stevenschoen/emojiswitcher/billing/IabHelper.java
@@ -264,7 +264,8 @@ public void onServiceConnected(ComponentName name, IBinder service) {
 
         Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
         serviceIntent.setPackage("com.android.vending");
-        if (!mContext.getPackageManager().queryIntentServices(serviceIntent, 0).isEmpty()) {
+        List<ResolveInfo> resolveInfoList = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
+        if (resolveInfoList != null && !resolveInfoList.isEmpty()) {
             // service available to handle that Intent
             mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
         }