Updated in app purchase helper, and added listener for redeemed promo codes. Don't do automatic device scan on very first launch until login is chosen or skipped. Fixed scan all functionality. Styled chromecast and wear purchase popups.

Author: Chris Bellew

mobile/src/main/java/com/android/vending/billing/IabBroadcastReceiver.java

@@ -0,0 +1,60 @@
+/* Copyright (c) 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.vending.billing;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Receiver for the "com.android.vending.billing.PURCHASES_UPDATED" Action
+ * from the Play Store.
+ *
+ * <p>It is possible that an in-app item may be acquired without the
+ * application calling getBuyIntent(), for example if the item can be
+ * redeemed from inside the Play Store using a promotional code. If this
+ * application isn't running at the time, then when it is started a call
+ * to getPurchases() will be sufficient notification. However, if the
+ * application is already running in the background when the item is acquired,
+ * a message to this BroadcastReceiver will indicate that the an item
+ * has been acquired.</p>
+ */
+public class IabBroadcastReceiver extends BroadcastReceiver {
+    /**
+     * Listener interface for received broadcast messages.
+     */
+    public interface IabBroadcastListener {
+        void receivedBroadcast();
+    }
+
+    /**
+     * The Intent action that this Receiver should filter for.
+     */
+    public static final String ACTION = "com.android.vending.billing.PURCHASES_UPDATED";
+
+    private final IabBroadcastListener mListener;
+
+    public IabBroadcastReceiver(IabBroadcastListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mListener != null) {
+            mListener.receivedBroadcast();
+        }
+    }
+}

mobile/src/main/java/com/android/vending/billing/IabHelper.java

@@ -32,6 +32,7 @@ public class Purchase {
     String mToken;
     String mOriginalJson;
     String mSignature;
+    boolean mIsAutoRenewing;
 
     public Purchase(String itemType, String jsonPurchaseInfo, String signature) throws JSONException {
         mItemType = itemType;
@@ -44,6 +45,7 @@ public Purchase(String itemType, String jsonPurchaseInfo, String signature) thro
         mPurchaseState = o.optInt("purchaseState");
         mDeveloperPayload = o.optString("developerPayload");
         mToken = o.optString("token", o.optString("purchaseToken"));
+        mIsAutoRenewing = o.optBoolean("autoRenewing");
         mSignature = signature;
     }
 
@@ -57,6 +59,7 @@ public Purchase(String itemType, String jsonPurchaseInfo, String signature) thro
     public String getToken() { return mToken; }
     public String getOriginalJson() { return mOriginalJson; }
     public String getSignature() { return mSignature; }
+    public boolean isAutoRenewing() { return mIsAutoRenewing; }
 
     @Override
     public String toString() { return "PurchaseInfo(type:" + mItemType + "):" + mOriginalJson; }

mobile/src/main/java/com/android/vending/billing/Purchase.java

@@ -16,12 +16,9 @@
 package com.android.vending.billing;
 
 import android.text.TextUtils;
+import android.util.Base64;
 import android.util.Log;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
@@ -75,17 +72,14 @@ public static boolean verifyPurchase(String base64PublicKey, String signedData,
      */
     public static PublicKey generatePublicKey(String encodedPublicKey) {
         try {
-            byte[] decodedKey = Base64.decode(encodedPublicKey);
+            byte[] decodedKey = Base64.decode(encodedPublicKey, Base64.DEFAULT);
             KeyFactory keyFactory = KeyFactory.getInstance(KEY_FACTORY_ALGORITHM);
             return keyFactory.generatePublic(new X509EncodedKeySpec(decodedKey));
         } catch (NoSuchAlgorithmException e) {
             throw new RuntimeException(e);
         } catch (InvalidKeySpecException e) {
             Log.e(TAG, "Invalid key specification.");
             throw new IllegalArgumentException(e);
-        } catch (Base64DecoderException e) {
-            Log.e(TAG, "Base64 decoding failed.");
-            throw new IllegalArgumentException(e);
         }
     }
 
@@ -99,12 +93,18 @@ public static PublicKey generatePublicKey(String encodedPublicKey) {
      * @return true if the data and signature match
      */
     public static boolean verify(PublicKey publicKey, String signedData, String signature) {
-        Signature sig;
+        byte[] signatureBytes;
         try {
-            sig = Signature.getInstance(SIGNATURE_ALGORITHM);
+            signatureBytes = Base64.decode(signature, Base64.DEFAULT);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Base64 decoding failed.");
+            return false;
+        }
+        try {
+            Signature sig = Signature.getInstance(SIGNATURE_ALGORITHM);
             sig.initVerify(publicKey);
             sig.update(signedData.getBytes());
-            if (!sig.verify(Base64.decode(signature))) {
+            if (!sig.verify(signatureBytes)) {
                 Log.e(TAG, "Signature verification failed.");
                 return false;
             }
@@ -115,8 +115,6 @@ public static boolean verify(PublicKey publicKey, String signedData, String sign
             Log.e(TAG, "Invalid key specification.");
         } catch (SignatureException e) {
             Log.e(TAG, "Signature exception.");
-        } catch (Base64DecoderException e) {
-            Log.e(TAG, "Base64 decoding failed.");
         }
         return false;
     }

mobile/src/main/java/com/android/vending/billing/Security.java

@@ -22,13 +22,15 @@
  * Represents an in-app product's listing details.
  */
 public class SkuDetails {
-    String mItemType;
-    String mSku;
-    String mType;
-    String mPrice;
-    String mTitle;
-    String mDescription;
-    String mJson;
+    private final String mItemType;
+    private final String mSku;
+    private final String mType;
+    private final String mPrice;
+    private final long mPriceAmountMicros;
+    private final String mPriceCurrencyCode;
+    private final String mTitle;
+    private final String mDescription;
+    private final String mJson;
 
     public SkuDetails(String jsonSkuDetails) throws JSONException {
         this(IabHelper.ITEM_TYPE_INAPP, jsonSkuDetails);
@@ -41,13 +43,17 @@ public SkuDetails(String itemType, String jsonSkuDetails) throws JSONException {
         mSku = o.optString("productId");
         mType = o.optString("type");
         mPrice = o.optString("price");
+        mPriceAmountMicros = o.optLong("price_amount_micros");
+        mPriceCurrencyCode = o.optString("price_currency_code");
         mTitle = o.optString("title");
         mDescription = o.optString("description");
     }
 
     public String getSku() { return mSku; }
     public String getType() { return mType; }
     public String getPrice() { return mPrice; }
+    public long getPriceAmountMicros() { return mPriceAmountMicros; }
+    public String getPriceCurrencyCode() { return mPriceCurrencyCode; }
     public String getTitle() { return mTitle; }
     public String getDescription() { return mDescription; }
 

mobile/src/main/java/com/android/vending/billing/SkuDetails.java

@@ -70,8 +70,6 @@ public PlexSubscription() {
   }
 
   public void setListener(PlexSubscriptionListener _listener) {
-    if(_listener != null)
-      Logger.d("Setting listener to %s", _listener.getClass().getSimpleName());
     listener = _listener;
     if(_listener != null) {
       notificationListener = _listener;

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

@@ -9,6 +9,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.IntentFilter;
 import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -20,6 +21,7 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
+import com.android.vending.billing.IabBroadcastReceiver;
 import com.android.vending.billing.IabHelper;
 import com.android.vending.billing.IabResult;
 import com.android.vending.billing.Inventory;
@@ -64,6 +66,7 @@
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -105,6 +108,8 @@ public enum NOTIFICATION_STATUS {
     initializing
   }
 
+  private IabBroadcastReceiver promoReceiver;
+
   public static HashMap<String, String[]> chromecastVideoOptions = new LinkedHashMap<String, String[]>();
 
   private NotificationManager mNotifyMgr;
@@ -127,6 +132,7 @@ public enum NOTIFICATION_STATUS {
 
   // In-app purchasing
   private IabHelper mIabHelper;
+  private boolean iabHelperSetupDone = false;
   // TODO: Obfuscate this somehow:
   String base64EncodedPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlgV+Gdi4nBVn2rRqi+oVLhenzbWcEVyUf1ulhvAElEf6c8iuX3OB4JZRYVhCE690mFaYUdEb8OG8p8wT7IrQmlZ0DRfP2X9csBJKd3qB+l9y11Ggujivythvoiz+uvDPhz54O6wGmUB8+oZXN+jk9MT5Eia3BZxJDvgFcmDe/KQTTKZoIk1Qs/4PSYFP8jaS/lc71yDyRmvAM+l1lv7Ld8h69hVvKFUr9BT/20lHQGohCIc91CJvKIP5DaptbE98DAlrTxjZRRpbi+wrLGKVbJpUOBgPC78qo3zPITn6M6N0tHkv1tHkGOeyLUbxOC0wFdXj33mUldV/rp3tHnld1wIDAQAB";
   private boolean inventoryQueried = false;
@@ -535,22 +541,34 @@ public void onIabSetupFinished(IabResult result) {
 //        Logger.d("Hash: %s", getEmailHash());
         if (!result.isSuccess()) {
           // Oh noes, there was a problem.
-          Logger.d("Problem setting up in-app billing: " + result);
+          Logger.d("Problem setting up in-app billing: %s", result);
           return;
         }
 
-
-
         // Have we been disposed of in the meantime? If so, quit.
         if (mIabHelper == null) return;
 
+        promoReceiver = new IabBroadcastReceiver(new IabBroadcastReceiver.IabBroadcastListener() {
+          @Override
+          public void receivedBroadcast() {
+            mIabHelper.queryInventoryAsync(mGotInventoryListener);
+          }
+        });
+        IntentFilter broadcastFilter = new IntentFilter(IabBroadcastReceiver.ACTION);
+        registerReceiver(promoReceiver, broadcastFilter);
+
         // IAB is fully set up. Now, let's get an inventory of stuff we own.
         Logger.d("Setup successful. Querying inventory.");
         mIabHelper.queryInventoryAsync(mGotInventoryListener);
       }
     });
   }
 
+  public void refreshInAppInventory() {
+    if(mIabHelper != null && iabHelperSetupDone)
+      mIabHelper.queryInventoryAsync(mGotInventoryListener);
+  }
+
   IabHelper.QueryInventoryFinishedListener mGotInventoryListener = new IabHelper.QueryInventoryFinishedListener() {
     public void onQueryInventoryFinished(IabResult result, final Inventory inventory) {
 
@@ -563,6 +581,8 @@ public void onQueryInventoryFinished(IabResult result, final Inventory inventory
         return;
       }
 
+      iabHelperSetupDone = true;
+
       Logger.d("Query inventory was successful.");
 
       // Get the price for chromecast & wear support
@@ -810,4 +830,24 @@ public void handleUncaughtException (Thread thread, Throwable e) {
     e.printStackTrace();
     prefs.put(Preferences.CRASHED, true);
   }
+
+  @Override
+  public void onTerminate() {
+    super.onTerminate();
+
+    if(promoReceiver != null)
+      unregisterReceiver(promoReceiver);
+
+    if(mIabHelper != null)
+      mIabHelper.dispose();
+    mIabHelper = null;
+  }
+
+  public int getSecondsSinceLastServerScan() {
+    Date now = new Date();
+    Date lastServerScan = new Date(prefs.get(Preferences.LAST_SERVER_SCAN, 0l));
+    Logger.d("now: %s", now);
+    Logger.d("lastServerScan: %s", lastServerScan);
+    return (int)((now.getTime() - lastServerScan.getTime())/1000);
+  }
 }