[Wear] Only push intents to activities if the app is visible.

[Wear] Updated mic button.
[Wear] Retry getting playback state from handheld until the handheld has had a chance to check with google whether Wear Support has been purchased or not.
[Wear] If voice input is canceled, finish the activity and go back to the home screen.

Author: Chris Bellew

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

@@ -36,6 +36,7 @@
 import com.atomjack.shared.UriSerializer;
 import com.atomjack.shared.WearConstants;
 import com.atomjack.vcfp.activities.CastActivity;
+import com.atomjack.vcfp.activities.MainActivity;
 import com.atomjack.vcfp.activities.NowPlayingActivity;
 import com.atomjack.vcfp.interfaces.BitmapHandler;
 import com.atomjack.vcfp.interfaces.ServerFindHandler;
@@ -122,6 +123,7 @@ public static enum NOTIFICATION_STATUS {
   private IabHelper mIabHelper;
   // TODO: Obfuscate this somehow:
   String base64EncodedPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlgV+Gdi4nBVn2rRqi+oVLhenzbWcEVyUf1ulhvAElEf6c8iuX3OB4JZRYVhCE690mFaYUdEb8OG8p8wT7IrQmlZ0DRfP2X9csBJKd3qB+l9y11Ggujivythvoiz+uvDPhz54O6wGmUB8+oZXN+jk9MT5Eia3BZxJDvgFcmDe/KQTTKZoIk1Qs/4PSYFP8jaS/lc71yDyRmvAM+l1lv7Ld8h69hVvKFUr9BT/20lHQGohCIc91CJvKIP5DaptbE98DAlrTxjZRRpbi+wrLGKVbJpUOBgPC78qo3zPITn6M6N0tHkv1tHkGOeyLUbxOC0wFdXj33mUldV/rp3tHnld1wIDAQAB";
+  private boolean inventoryQueried = false;
 
   // Has the user purchased chromecast/wear support?
   // This is the default value.
@@ -138,6 +140,9 @@ public static enum NOTIFICATION_STATUS {
 
   GoogleApiClient googleApiClient;
 
+  // This is needed so that we can let the main activity know that wear support is enabled, after querying the inventory from Google
+  private MainActivity mainActivity;
+
   @Override
   public void onCreate() {
     super.onCreate();
@@ -627,7 +632,7 @@ public void onQueryInventoryFinished(IabResult result, final Inventory inventory
 
       Logger.d("Query inventory was successful.");
 
-      // Get the price for chromecast support
+      // Get the price for chromecast & wear support
       mIabHelper.queryInventoryAsync(true, new ArrayList<String>(Arrays.asList(SKU_CHROMECAST, SKU_WEAR)), new IabHelper.QueryInventoryFinishedListener() {
         @Override
         public void onQueryInventoryFinished(IabResult result, Inventory inv) {
@@ -655,6 +660,7 @@ public void onQueryInventoryFinished(IabResult result, Inventory inv) {
           Logger.d("Has Chromecast: %s", mHasChromecast);
           Logger.d("Has Wear: %s", mHasWear);
           Logger.d("Initial inventory query finished.");
+          inventoryQueried = true;
           onInventoryQueryFinished();
         }
       });
@@ -663,13 +669,26 @@ public void onQueryInventoryFinished(IabResult result, Inventory inv) {
     }
   };
 
+  public boolean getInventoryQueried() {
+    return inventoryQueried;
+  }
+
   // This runs once we have queried the play store to see if chromecast or wear support have been purchased.
   // If Wear support has not been purchased, we can attempt to contact a connected Wear device, and if we hear back,
   // we can throw a popup alerting the user that the app supports Wear
   private void onInventoryQueryFinished() {
-    Logger.d("[VoiceControlForPlexApplication] Sending ping");
-    if(!mHasWear)
+    if(!mHasWear) {
+      Logger.d("[VoiceControlForPlexApplication] Sending ping");
       new SendToDataLayerThread(WearConstants.PING, this).start();
+    } else {
+      if(mainActivity != null) {
+        mainActivity.hidePurchaseWearMenuItem();
+      }
+    }
+  }
+
+  public void setOnHasWearActivity(MainActivity activity) {
+    mainActivity = activity;
   }
 
   boolean verifyDeveloperPayload(Purchase p) {
@@ -778,13 +797,11 @@ public static Asset createAssetFromBitmap(Bitmap bitmap) {
   public static void SetWearMediaTitles(DataMap dataMap, PlexMedia media) {
     if(media.isShow()) {
       dataMap.putString(WearConstants.MEDIA_TITLE, media.getTitle());
-      Logger.d("[VCFPActivity] got show title: %s", media.getTitle());
       dataMap.putString(WearConstants.MEDIA_SUBTITLE, media.getEpisodeTitle());
     } else if(media.isMovie()) {
       dataMap.putString(WearConstants.MEDIA_TITLE, media.title);
       dataMap.remove(WearConstants.MEDIA_SUBTITLE);
     } else if(media.isMusic()) {
-      Logger.d("[VCFPActivity] got music: %s by %s", media.title, media.grandparentTitle);
       dataMap.putString(WearConstants.MEDIA_TITLE, media.grandparentTitle);
       dataMap.putString(WearConstants.MEDIA_SUBTITLE, media.title);
     }

mobile/src/main/java/com/atomjack/vcfp/activities/CastActivity.java

@@ -212,6 +212,7 @@ protected void onPause() {
       castManager.decrementUiCounter();
       castManager.removeVideoCastConsumer(castConsumer);
     }
+    VoiceControlForPlexApplication.applicationPaused();
 		super.onPause();
 	}
 

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -106,6 +106,11 @@ public class MainActivity extends VCFPActivity implements TextToSpeech.OnInitLis
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+    Logger.d("[MainActivity] onCreate");
+
+    // This will enable the UI to be updated (Wear Support hidden/Wear Options shown)
+    // once inventory is queried via Google, if wear support has been purchased
+    VoiceControlForPlexApplication.getInstance().setOnHasWearActivity(this);
 
 		final WhatsNewDialog whatsNewDialog = new WhatsNewDialog(this);
 		whatsNewDialog.show();
@@ -1059,7 +1064,7 @@ public void onDisconnected() {
   }
 
   @Override
-  protected void hidePurchaseWearMenuItem() {
+  public void hidePurchaseWearMenuItem() {
     MenuItem wearItem = menu.findItem(R.id.menu_purchase_wear);
     wearItem.setVisible(false);
     MenuItem wearOptionsItem = menu.findItem(R.id.menu_wear_options);
@@ -1089,6 +1094,8 @@ public void onClick(DialogInterface dialog, int id) {
     });
     chooserDialog.show();
   }
+
+
 }
 
 

mobile/src/main/java/com/atomjack/vcfp/services/WearListenerService.java

@@ -3,61 +3,37 @@
 
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.net.Uri;
+import android.os.Handler;
 import android.speech.RecognizerIntent;
 
 import com.atomjack.shared.Logger;
 import com.atomjack.shared.SendToDataLayerThread;
-import com.atomjack.shared.UriSerializer;
 import com.atomjack.shared.WearConstants;
-import com.atomjack.shared.UriDeserializer;
 import com.atomjack.vcfp.CastPlayerManager;
 import com.atomjack.shared.PlayerState;
-import com.atomjack.vcfp.PlexHeaders;
 import com.atomjack.vcfp.PlexSubscription;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
+import com.atomjack.vcfp.activities.CastActivity;
 import com.atomjack.vcfp.activities.MainActivity;
 import com.atomjack.vcfp.activities.NowPlayingActivity;
 import com.atomjack.vcfp.activities.VCFPActivity;
 import com.atomjack.vcfp.interfaces.BitmapHandler;
-import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexClient;
-import com.atomjack.shared.model.Timeline;
 import com.atomjack.vcfp.model.PlexMedia;
-import com.atomjack.vcfp.net.PlexHttpClient;
 import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.wearable.Asset;
-import com.google.android.gms.wearable.DataEvent;
-import com.google.android.gms.wearable.DataEventBuffer;
 import com.google.android.gms.wearable.DataMap;
-import com.google.android.gms.wearable.DataMapItem;
 import com.google.android.gms.wearable.MessageEvent;
 import com.google.android.gms.wearable.Wearable;
 import com.google.android.gms.wearable.WearableListenerService;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-
-import org.apache.http.Header;
-import org.apache.http.message.BasicHeader;
-
-import java.io.ByteArrayOutputStream;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Hashtable;
 
 public class WearListenerService extends WearableListenerService {
 
-  protected Gson gsonRead = new GsonBuilder()
-          .registerTypeAdapter(Uri.class, new UriDeserializer())
-          .create();
-
-  protected Gson gsonWrite = new GsonBuilder()
-          .registerTypeAdapter(Uri.class, new UriSerializer())
-          .create();
-
   GoogleApiClient googleApiClient;
 
+  Handler handler = new Handler();
+  // How many times we've had the wear request playback state.
+  int playbackStateRetries = 0;
+
   @Override
   public void onCreate() {
     super.onCreate();
@@ -67,39 +43,38 @@ public void onCreate() {
     googleApiClient.connect();
   }
 
-//  @Override
-//  public void onDataChanged(DataEventBuffer dataEvents) {
-//    Logger.d("[WearListenerService] onDataChanged");
-//    DataMap dataMap;
-//    for (DataEvent event : dataEvents) {
-//      dataMap = DataMapItem.fromDataItem(event.getDataItem()).getDataMap();
-//      // Check the data type
-//      if (event.getType() == DataEvent.TYPE_CHANGED) {
-//        // Check the data path
-//        String path = event.getDataItem().getUri().getPath();
-//        if (path.equals(WearConstants.GET_PLAYBACK_STATE)) {
-//          Logger.d("GET_PLAYBACK_STATE");
-//        }
-//      }
-//    }
-//
-//  }
-
   @Override
   public void onMessageReceived(MessageEvent messageEvent) {
     String message = messageEvent.getPath() == null ? "" : messageEvent.getPath();
     Logger.d("[WearListenerService] onMessageReceived: %s", message);
+    if(!VoiceControlForPlexApplication.getInstance().getInventoryQueried() && message.equals(WearConstants.GET_PLAYBACK_STATE)) {
+      // This message was received before we've had a chance to check with Google on whether or not Wear support
+      // has been purchased. After a delay of 500ms, send a message back to the Wearable to get playback state again.
+      // By then, it should have had time to see if Wear Support has been purchased.
+      playbackStateRetries++;
+      if(playbackStateRetries < 4) {
+        handler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+            new SendToDataLayerThread(WearConstants.RETRY_GET_PLAYBACK_STATE, WearListenerService.this).start();
+          }
+        }, 500);
+        return;
+      }
+    }
     if(!VoiceControlForPlexApplication.getInstance().hasWear() && !message.equals(WearConstants.PONG)) {
       // Wear support has not been purchased, so send a message back to the wear device, and show the purchase required
       // popup on the handheld. However, if the message is 'pong', a response to a 'ping', skip since we want to react to a pong
       // even if wear support has not been purchased (so we can alert the user to the option to purchase)
       new SendToDataLayerThread(WearConstants.WEAR_UNAUTHORIZED, this).start();
-      Intent intent = new Intent(this, MainActivity.class);
-      intent.setAction(com.atomjack.shared.Intent.SHOW_WEAR_PURCHASE_REQUIRED);
-      intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
-      intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-      intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-      startActivity(intent);
+      if(VoiceControlForPlexApplication.isApplicationVisible()) {
+        Intent intent = new Intent(this, MainActivity.class);
+        intent.setAction(com.atomjack.shared.Intent.SHOW_WEAR_PURCHASE_REQUIRED);
+        intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+      }
       return;
     }
     if(messageEvent.getPath() != null) {
@@ -176,22 +151,26 @@ public void onSuccess(Bitmap bitmap) {
 
       } else if(message.equals(WearConstants.GET_PLAYING_MEDIA)) {
         // Send an intent to NowPlayingActivity to tell it to forward on information about the currently playing media back to the wear device
-        Intent intent = new Intent(this, NowPlayingActivity.class);
-        intent.setAction(com.atomjack.shared.Intent.GET_PLAYING_MEDIA);
-        intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
+        if(VoiceControlForPlexApplication.isApplicationVisible()) {
+          Class theClass = castPlayerManager.isSubscribed() ? CastActivity.class : NowPlayingActivity.class;
+          Intent intent = new Intent(this, theClass);
+          intent.setAction(com.atomjack.shared.Intent.GET_PLAYING_MEDIA);
+          intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
+          intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+          intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+          startActivity(intent);
+        }
       } else if(message.equals(WearConstants.PONG)) {
         // Received a pong back from the user, so show a popup allowing the user to purchase wear support.
         Logger.d("[WearListenerService] Received pong");
-
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.setAction(com.atomjack.shared.Intent.SHOW_WEAR_PURCHASE);
-        intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
-        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
+        if(VoiceControlForPlexApplication.isApplicationVisible()) {
+          Intent intent = new Intent(this, MainActivity.class);
+          intent.setAction(com.atomjack.shared.Intent.SHOW_WEAR_PURCHASE);
+          intent.addFlags(Intent.FLAG_FROM_BACKGROUND);
+          intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+          intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+          startActivity(intent);
+        }
       } else if(message.equals(WearConstants.ACTION_PAUSE) || message.equals(WearConstants.ACTION_PLAY) || message.equals(WearConstants.ACTION_STOP)) {
         Intent intent = new android.content.Intent(this, PlexControlService.class);
         intent.setAction(message);

shared/src/main/java/com/atomjack/shared/SendToDataLayerThread.java

@@ -47,7 +47,7 @@ public SendToDataLayerThread(String path, Context context) {
 
   public void sendDataItem() {
     sendDataItem = true;
-    this.start();
+    start();
   }
 
   public void run() {

shared/src/main/java/com/atomjack/shared/WearConstants.java

@@ -27,6 +27,8 @@ public class WearConstants {
 
   // This is used to know whether or not the voice input was triggered from an initial launch of the app
   public final static String LAUNCHED = "com.atomjack.vcfp.launched";
+  public final static String RETRY_GET_PLAYBACK_STATE = "com.atomjack.vcfp.retry_get_playback_state";
+
 
   public final static String FINISH = "com.atomjack.vcfp.finish";
 

wear/src/main/java/com/atomjack/vcfp/MainActivity.java

@@ -158,14 +158,16 @@ protected void onStart() {
 
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    Logger.d("[VoiceInputActivity] onActivityResult: %s", requestCode);
+    Logger.d("[MainActivity] onActivityResult. requestCode: %d, resultCode: %d", requestCode, resultCode);
     if (requestCode == SPEECH_RECOGNIZER_REQUEST_CODE) {
       // When the speech recognizer finishes its work, Android invokes this callback with requestCode equal to SPEECH_RECOGNIZER_REQUEST_CODE
       if (resultCode == RESULT_OK) {
         DataMap dataMap = new DataMap();
         dataMap.putStringArrayList(WearConstants.SPEECH_QUERY, data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS));
         new SendToDataLayerThread(WearConstants.SPEECH_QUERY, dataMap, MainActivity.this).start();
         finish();
+      } else if(resultCode == RESULT_CANCELED) {
+        finish();
       }
     }
     super.onActivityResult(requestCode, resultCode, data);

wear/src/main/java/com/atomjack/vcfp/WearListenerService.java

@@ -63,7 +63,11 @@ public void onMessageReceived(MessageEvent messageEvent) {
       DataMap dataMap = DataMap.fromByteArray(messageEvent.getData());
       Logger.d("[WearListenerService] data: %s", dataMap);
 
-      if(message.equals(WearConstants.GET_PLAYBACK_STATE)) {
+      if(message.equals(WearConstants.RETRY_GET_PLAYBACK_STATE)) {
+        DataMap dataMap1 = new DataMap();
+        dataMap1.putBoolean(WearConstants.LAUNCHED, true);
+        new SendToDataLayerThread(WearConstants.GET_PLAYBACK_STATE, dataMap1, this).start();
+      } else if(message.equals(WearConstants.GET_PLAYBACK_STATE)) {
 
         PlayerState state = PlayerState.getState(dataMap.getString(WearConstants.PLAYBACK_STATE));
         Logger.d("[WearListenerService] state: %s", state);