Merge pull request #27 from DanDits/patch-1

Fixed NPE on devices without billing service
SufficientlySecure · Oct 16, 2015 · ef099b0 · ef099b0
2 parents 1cabc13 + 065cca2
commit ef099b0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Donations/src/main/java/org/sufficientlysecure/donations/google/util/IabHelper.java b/Donations/src/main/java/org/sufficientlysecure/donations/google/util/IabHelper.java
@@ -265,7 +265,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> queriedIntentServices = mContext.getPackageManager().queryIntentServices(serviceIntent, 0);
+        if (queriedIntentServices != null && !queriedIntentServices.isEmpty()) {
             // service available to handle that Intent
             mContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
         }