Bunch of fixes.

Author: Chris Bellew

Voice Control For Plex/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
     package="com.atomjack.vcfp"
-    android:versionCode="20"
-    android:versionName="1.9.0b1" >
+    android:versionCode="21"
+    android:versionName="1.9.0b2" >
 
     <uses-permission android:name="com.mohammadag.googlesearchapi.permission.ACCESS_GGOGLE_SEARCH_API" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -98,21 +98,6 @@
                 android:name="android.appwidget.provider"
                 android:resource="@layout/listener_widget" />
         </receiver>
-        <activity
-            android:name="com.google.sample.castcompanionlibrary.cast.player.VideoCastControllerActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:parentActivityName="com.atomjack.vcfp.activities.CastActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Theme.CastVideoOverlayYellow" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.google.sample.cast.refplayer.VideoBrowserActivity" />
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
         <service
             android:name=".services.PlexControlService"
             android:exported="false"/>

Voice Control For Plex/src/main/java/com/atomjack/vcfp/CastPlayerManager.java

@@ -35,6 +35,8 @@ public static final class PARAMS {
     public static final String KEY = "key";
     public static final String THUMB = "thumb";
     public static final String OFFSET = "offset";
+    public static final String RESUME="resume";
+
     public static final String SRC = "src";
     public static final String ART = "art";
 
@@ -169,7 +171,7 @@ public void seekTo(int seconds) {
       obj.put(PARAMS.ACTION, PARAMS.ACTION_SEEK);
       if(nowPlayingMedia instanceof PlexVideo)
         obj.put(PARAMS.SRC, getTranscodeUrl(nowPlayingMedia, seconds));
-      obj.put(PARAMS.OFFSET, seconds);
+      obj.put(PARAMS.RESUME, VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.RESUME, false));
       sendMessage(obj);
     } catch (Exception ex) {}
 
@@ -369,7 +371,7 @@ public JSONObject buildMedia(int offset) {
         data.put(PARAMS.PLEX_USERNAME, VoiceControlForPlexApplication.getInstance().prefs.getString(Preferences.PLEX_USERNAME));
       }
       data.put(PARAMS.MEDIA_TYPE, nowPlayingMedia instanceof PlexVideo ? PARAMS.MEDIA_TYPE_VIDEO : PARAMS.MEDIA_TYPE_AUDIO);
-      data.put(PARAMS.OFFSET, offset);
+      data.put(PARAMS.RESUME, VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.RESUME, false));
       data.put(PARAMS.CLIENT, VoiceControlForPlexApplication.gsonWrite.toJson(mClient));
       data.put(PARAMS.SRC, getTranscodeUrl(nowPlayingMedia, offset));
       data.put(PARAMS.PLAYLIST, getPlaylistJson());

Voice Control For Plex/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -34,6 +34,7 @@
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexMedia;
 import com.atomjack.vcfp.model.PlexServer;
+import com.atomjack.vcfp.model.PlexTrack;
 import com.atomjack.vcfp.services.PlexControlService;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -89,6 +90,7 @@ public static enum NOTIFICATION_STATUS {
 
   private NotificationManager mNotifyMgr;
   private Bitmap notificationBitmap = null;
+  private Bitmap notificationBitmapBig = null;
 
 	public final static class Intent {
 			public final static String GDMRECEIVE = "com.atomjack.vcfp.intent.gdmreceive";
@@ -354,40 +356,42 @@ public void setNotification(final PlexClient client, final PlayerState currentSt
     setNotification(client, currentState, media, false);
   }
 
-  public void setNotification(final PlexClient client, final PlayerState currentState, final PlexMedia media, boolean skipThumb) {
-    Logger.d("Setting notification, client: %s, media: %s", client, media);
-    if(notificationStatus == NOTIFICATION_STATUS.off) {
-      notificationStatus = NOTIFICATION_STATUS.initializing;
-      notificationBitmap = null;
-    }
+  private Bitmap getCachedBitmap(String key) {
+    if(key == null)
+      return null;
 
+    Bitmap bitmap = null;
     try {
-      Logger.d("Trying to get cached thumb: %s", media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB));
-      SimpleDiskCache.BitmapEntry bitmapEntry = mSimpleDiskCache.getBitmap(media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB));
+      Logger.d("Trying to get cached thumb: %s", key);
+      SimpleDiskCache.BitmapEntry bitmapEntry = mSimpleDiskCache.getBitmap(key);
       Logger.d("bitmapEntry: %s", bitmapEntry);
       if(bitmapEntry != null) {
-        notificationBitmap = bitmapEntry.getBitmap();
+        bitmap = bitmapEntry.getBitmap();
       }
     } catch (Exception ex) {
       ex.printStackTrace();
     }
 
-    if(notificationBitmap == null && notificationStatus == NOTIFICATION_STATUS.initializing && !skipThumb) {
-      Logger.d("Thumb not found in cache. Downloading.");
+    return bitmap;
+
+
+  }
+
+  // Fetch the notification bitmap for the given key. Once it's been downloaded, we'll save the bitmap to the image cache, then set the
+  // notification again.
+  private void fetchNotificationBitmap(final PlexMedia.IMAGE_KEY key, final PlexClient client, final PlexMedia media, final PlayerState currentState) {
+      Logger.d("Thumb not found in cache. Downloading %s.", key);
       new AsyncTask() {
         @Override
         protected Object doInBackground(Object[] objects) {
           if (client != null && media != null) {
-            InputStream inputStream = media.getNotificationThumb();
-            Logger.d("Got input stream: %s", inputStream);
-            notificationBitmap = BitmapFactory.decodeStream(inputStream);
+            InputStream inputStream = media.getNotificationThumb(media instanceof PlexTrack ? PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB_MUSIC : key);
             try {
               inputStream.reset();
             } catch (IOException e) {}
-            Logger.d("notificationBitmap: %s", notificationBitmap);
             try {
-              Logger.d("image key: %s", media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB));
-              mSimpleDiskCache.put(media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB), inputStream);
+              Logger.d("image key: %s", media.getImageKey(key));
+              mSimpleDiskCache.put(media.getImageKey(key), inputStream);
               inputStream.close();
               Logger.d("Downloaded thumb. Redoing notification.");
               setNotification(client, currentState, media, true);
@@ -396,10 +400,29 @@ protected Object doInBackground(Object[] objects) {
           return null;
         }
       }.execute();
+  }
+
+  public void setNotification(final PlexClient client, final PlayerState currentState, final PlexMedia media, boolean skipThumb) {
+    Logger.d("Setting notification, client: %s, media: %s", client, media);
+    if(client == null) {
+      Logger.d("Client is null for some reason");
+      return;
+    }
+    if(notificationStatus == NOTIFICATION_STATUS.off) {
+      notificationStatus = NOTIFICATION_STATUS.initializing;
+      notificationBitmap = null;
+      notificationBitmapBig = null;
     }
 
+    notificationBitmap = getCachedBitmap(media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB));
+    if(notificationBitmap == null && notificationStatus == NOTIFICATION_STATUS.initializing && !skipThumb)
+      fetchNotificationBitmap(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB, client, media, currentState);
+    notificationBitmapBig = getCachedBitmap(media.getImageKey(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB_BIG));
+    if(notificationBitmapBig == null && notificationStatus == NOTIFICATION_STATUS.initializing && !skipThumb)
+      fetchNotificationBitmap(PlexMedia.IMAGE_KEY.NOTIFICATION_THUMB_BIG, client, media, currentState);
+
+
     Logger.d("Setting up notification");
-    // notificationBitmap
     android.content.Intent rewindIntent = new android.content.Intent(VoiceControlForPlexApplication.this, PlexControlService.class);
     rewindIntent.setAction(PlexControlService.ACTION_REWIND);
     rewindIntent.putExtra(PlexControlService.CLIENT, client);
@@ -421,7 +444,6 @@ protected Object doInBackground(Object[] objects) {
     android.content.Intent nowPlayingIntent;
     if(client.isCastClient) {
       nowPlayingIntent = new android.content.Intent(VoiceControlForPlexApplication.this, CastActivity.class);
-//            nowPlayingIntent.setAction(Intent.CAST_MEDIA);
     } else
       nowPlayingIntent = new android.content.Intent(VoiceControlForPlexApplication.this, NowPlayingActivity.class);
     nowPlayingIntent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK |
@@ -438,11 +460,11 @@ protected Object doInBackground(Object[] objects) {
                       .setOngoing(true)
                       .setOnlyAlertOnce(true)
                       .setContentIntent(piNowPlaying)
-                      .setContent(getNotificationView(R.layout.now_playing_notification, notificationBitmap, media, client, playPendingIntent, pausePendingIntent, piRewind, currentState == PlayerState.PLAYING))
+                      .setContent(getNotificationView(media.isMusic() ? R.layout.now_playing_notification_music : R.layout.now_playing_notification, notificationBitmap, media, client, playPendingIntent, pausePendingIntent, piRewind, currentState == PlayerState.PLAYING))
                       .setDefaults(Notification.DEFAULT_ALL);
       Notification n = mBuilder.build();
       if (Build.VERSION.SDK_INT >= 16)
-        n.bigContentView = getNotificationView(media.isMusic() ? R.layout.now_playing_notification_big_music : R.layout.now_playing_notification_big, notificationBitmap, media, client, playPendingIntent, pausePendingIntent, piRewind, currentState == PlayerState.PLAYING);
+        n.bigContentView = getNotificationView(media.isMusic() ? R.layout.now_playing_notification_big_music : R.layout.now_playing_notification_big, notificationBitmapBig, media, client, playPendingIntent, pausePendingIntent, piRewind, currentState == PlayerState.PLAYING);
 
       // Disable notification sound
       n.defaults = 0;
@@ -474,7 +496,8 @@ private RemoteViews getNotificationView(int layoutId, Bitmap thumb, PlexMedia me
       title = String.format("%s - %s", media.grandparentTitle, media.title);
     else if(media.isShow())
       title = String.format("%s - %s", media.grandparentTitle, media.title);
-
+//    else if(media.isShow())
+//      title = String.format("%s - %s", media.grandparentTitle, media.title);
     remoteViews.setTextViewText(R.id.title, title);
     remoteViews.setTextViewText(R.id.playingOn, String.format(getString(R.string.playing_on), client.name));
 

Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/CastActivity.java

@@ -20,6 +20,8 @@
 import com.atomjack.vcfp.model.PlexMedia;
 import com.google.sample.castcompanionlibrary.cast.VideoCastManager;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class CastActivity extends PlayerActivity {
@@ -45,6 +47,10 @@ protected void onCreate(Bundle savedInstanceState) {
     resumePlayback = getIntent().getBooleanExtra("resume", false);
     castManager = castPlayerManager.getCastManager();
 
+    // If just playing a single track, put the media into an array
+    if(nowPlayingMedia.isMusic() && nowPlayingAlbum == null)
+      nowPlayingAlbum = Arrays.asList(nowPlayingMedia);
+
     Logger.d("[CastActivity] starting up, action: %s, current state: %s", getIntent().getAction(), castPlayerManager.getCurrentState());
     Logger.d("mClient: %s", mClient);
 		if(getIntent().getAction() != null && getIntent().getAction().equals(VoiceControlForPlexApplication.Intent.CAST_MEDIA)) {

Voice Control For Plex/src/main/java/com/atomjack/vcfp/activities/NowPlayingActivity.java

@@ -46,9 +46,11 @@ protected void onCreate(Bundle savedInstanceState) {
 			Logger.d("found saved instance state");
 			nowPlayingMedia = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
       mClient = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
+      Logger.d("[NowPlaying] set mClient: %s", mClient);
 		} else {
 			nowPlayingMedia = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
       mClient = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
+      Logger.d("[NowPlayingActivity] 2 set mClient: %s", mClient);
 		}
 
 		if(mClient == null || nowPlayingMedia == null)
@@ -121,8 +123,28 @@ public void doForward(View v) {
 		}
 	}
 
+  public void doNext(View v) {
+    Logger.d("doNext");
+    mClient.next(null);
+  }
+
+  public void doPrevious(View v) {
+    Logger.d("doPrevious");
+    mClient.previous(null);
+  }
+
 	public void doStop(View v) {
-    mClient.stop(null);
+    mClient.stop(new PlexHttpResponseHandler() {
+      @Override
+      public void onSuccess(PlexResponse response) {
+        finish();
+      }
+
+      @Override
+      public void onFailure(Throwable error) {
+        finish();
+      }
+    });
 	}
 
 	@Override
@@ -217,17 +239,12 @@ public void onFailure(Throwable error) {
 
   @Override
   protected void onSubscriptionMessage(Timeline timeline) {
-//    Logger.d("NowPlaying onSubscriptionMessage: %d", timeline.time);
+//    Logger.d("[NowPlaying] onSubscriptionMessage: %d, Continuing: %s", timeline.time, continuing);
     if(!isSeeking)
       seekBar.setProgress(timeline.time);
 
     if(continuing) {
-      showNowPlaying(false);
-      // Need to update the duration
-      seekBar.setMax(nowPlayingMedia.duration);
-      durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
-      Logger.d("[NowPlayingActivity] Setting thumb in onSubscriptionMessage");
-      setThumb();
+      onMediaChange();
       continuing = false;
     }
 
@@ -245,6 +262,16 @@ protected void onSubscriptionMessage(Timeline timeline) {
     }
   }
 
+  @Override
+  protected void onMediaChange() {
+    Logger.d("[NowPlayingActivity] onMediaChange: %s, duration %d", nowPlayingMedia.title, nowPlayingMedia.duration);
+    seekBar.setMax(nowPlayingMedia.duration);
+    durationDisplay.setText(VoiceControlForPlexApplication.secondsToTimecode(nowPlayingMedia.duration / 1000));
+    Logger.d("[NowPlayingActivity] Setting thumb in onSubscriptionMessage");
+    setThumb();
+    showNowPlaying(false);
+  }
+
   @Override
   public boolean onPrepareOptionsMenu(Menu _menu) {
     Logger.d("NowPlaying onPrepareOptionsMenu");