Hardcoded chromecast app id for release version. If build config value for an in app purchase is set to false, don't bother updating after querying store inventory for it.

Author: Chris Bellew

mobile/build.gradle

@@ -66,7 +66,7 @@ android {
             buildConfigField "String", "SKU_CHROMECAST", "\"chromecast\""
             buildConfigField "String", "SKU_WEAR", "\"wear\""
             buildConfigField "String", "SKU_LOCALMEDIA", "\"localplayback\""
-            buildConfigField "String", "CHROMECAST_APP_ID", "\"" + RELEASE_CHROMECAST_APP_ID + "\""
+            buildConfigField "String", "CHROMECAST_APP_ID", "\"328C6DAC\""
         }
         debug {
             debuggable true
@@ -80,37 +80,6 @@ android {
             buildConfigField "String", "SKU_LOCALMEDIA", "\"localplayback\""
             buildConfigField "String", "CHROMECAST_APP_ID", "\"" + DEBUG_CHROMECAST_APP_ID + "\""
         }
-        chromecast {
-            signingConfig signingConfigs.release
-            debuggable true
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            buildConfigField "boolean", "USE_BUGSENSE", "false"
-            buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "true"
-            buildConfigField "String", "SKU_CHROMECAST", "\"chromecast\""
-            buildConfigField "String", "SKU_WEAR", "\"wear\""
-            buildConfigField "String", "CHROMECAST_APP_ID", "\"" + RELEASE_CHROMECAST_APP_ID + "\""
-        }
-        chromecastTest {
-            signingConfig signingConfigs.release
-            debuggable true
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-            buildConfigField "boolean", "USE_BUGSENSE", "false"
-            buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "true"
-            buildConfigField "String", "SKU_CHROMECAST", "\"android.test.purchased\""
-            buildConfigField "String", "CHROMECAST_APP_ID", "\"" + RELEASE_CHROMECAST_APP_ID + "\""
-        }
-        beta {
-            debuggable true
-            signingConfig signingConfigs.debug
-            buildConfigField "boolean", "USE_BUGSENSE", "true"
-            buildConfigField "boolean", "CHROMECAST_REQUIRES_PURCHASE", "false"
-            buildConfigField "boolean", "WEAR_REQUIRES_PURCHASE", "false"
-            buildConfigField "String", "SKU_CHROMECAST", "\"android.test.purchased\""
-            buildConfigField "String", "SKU_WEAR", "\"android.test.purchased\""
-            buildConfigField "String", "CHROMECAST_APP_ID", "\"" + RELEASE_CHROMECAST_APP_ID + "\""
-        }
     }
     lintOptions {
         abortOnError false

mobile/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -713,14 +713,20 @@ public void onQueryInventoryFinished(IabResult result, Inventory inv) {
             if (inventory.hasPurchase(SKU_TEST_PURCHASED))
               mIabHelper.consumeAsync(inventory.getPurchase(SKU_TEST_PURCHASED),null);
           } else {
-            Purchase chromecastPurchase = inventory.getPurchase(SKU_CHROMECAST);
-            mHasChromecast = (chromecastPurchase != null && verifyDeveloperPayload(chromecastPurchase));
+            if(BuildConfig.CHROMECAST_REQUIRES_PURCHASE) {
+              Purchase chromecastPurchase = inventory.getPurchase(SKU_CHROMECAST);
+              mHasChromecast = (chromecastPurchase != null && verifyDeveloperPayload(chromecastPurchase));
+            }
 
-            Purchase wearPurchase = inventory.getPurchase(SKU_WEAR);
-            mHasWear = (wearPurchase != null && verifyDeveloperPayload(wearPurchase));
+            if(BuildConfig.WEAR_REQUIRES_PURCHASE) {
+              Purchase wearPurchase = inventory.getPurchase(SKU_WEAR);
+              mHasWear = (wearPurchase != null && verifyDeveloperPayload(wearPurchase));
+            }
 
-            Purchase localmediaPurchase = inventory.getPurchase(SKU_LOCALMEDIA);
-            mHasLocalMedia = (localmediaPurchase != null && verifyDeveloperPayload(localmediaPurchase));
+            if(BuildConfig.LOCALMEDIA_REQUIRES_PURCHASE) {
+              Purchase localmediaPurchase = inventory.getPurchase(SKU_LOCALMEDIA);
+              mHasLocalMedia = (localmediaPurchase != null && verifyDeveloperPayload(localmediaPurchase));
+            }
           }
 
           Logger.d("Has Chromecast: %s", mHasChromecast);