Added Chromecast Options. Added ability to email device logs. Lots of other fixes.

Author: Chris Bellew

VoiceControlForPlex.iml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="VoiceControlForPlex" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.1'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=gradle-2.1.zip
+distributionUrl=https\://downloads.gradle.org/distributions/gradle-2.5-all.zip

mobile/build.gradle

@@ -1,12 +1,13 @@
 apply plugin: 'android'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '22.0.1'
+    useLibrary  'org.apache.http.legacy'
+    compileSdkVersion 23
+    buildToolsVersion '23.0.0'
     defaultConfig {
         applicationId "com.atomjack.vcfp"
         minSdkVersion 15
-        targetSdkVersion 21
+        targetSdkVersion 23
     }
     dexOptions {
         preDexLibraries = false
@@ -104,20 +105,21 @@ android {
 
 dependencies {
     wearApp project(':wear')
-    compile 'com.loopj.android:android-async-http:1.4.4'
+    compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'
+    compile 'com.loopj.android:android-async-http:1.4.8'
     compile files('libs/bugsense-3.6.jar')
     compile('org.simpleframework:simple-xml:2.7.1') {
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'xpp3', module: 'xpp3'
     }
-    compile 'com.google.code.gson:gson:2.3.+'
-    compile 'com.android.support:support-v4:21.0+'
+    compile 'com.android.support:support-v4:23.0+'
     compile 'com.github.codechimp-org.apprater:library:1.0.+'
-    compile 'com.google.android.gms:play-services-wearable:6.5.87'
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:mediarouter-v7:19.1.+'
+    compile 'com.google.android.gms:play-services-wearable:7.8.0'
+    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:mediarouter-v7:23.0.0'
     compile project(':CastCompanionLibrary-android')
     compile 'com.jakewharton:disklrucache:2.0.2'
     compile files('libs/commons-io-2.4.jar')
     compile project(':shared')
+    compile files('libs/org.apache.http.legacy.jar')
 }

mobile/libs/org.apache.http.legacy.jar

@@ -14,7 +14,7 @@
 import com.atomjack.vcfp.model.PlexTrack;
 import com.atomjack.vcfp.model.PlexVideo;
 import com.google.android.gms.cast.ApplicationMetadata;
-import com.google.sample.castcompanionlibrary.cast.VideoCastManager;
+import com.google.android.libraries.cast.companionlibrary.cast.VideoCastManager;
 
 import org.json.JSONObject;
 
@@ -96,14 +96,18 @@ public void setContext(Context context) {
 
   public void subscribe(final PlexClient _client) {
     if(castManager == null) {
+      Logger.d("creating castManager");
       castManager = getCastManager(mContext);
       castManager.addVideoCastConsumer(castConsumer);
       castManager.incrementUiCounter();
     }
     if(castManager.isConnected()) {
       castManager.disconnect();
     }
-    castManager.setDevice(_client.castDevice);
+    Logger.d("selecting device: %s", _client.castDevice);
+    castManager.onDeviceSelected(_client.castDevice);
+//    castManager.setDevice(_client.castDevice);
+    Logger.d("device selected");
     castConsumer.setOnConnected(new Runnable() {
       @Override
       public void run() {
@@ -140,7 +144,7 @@ public void run() {
   }
 
   public boolean isSubscribed() {
-    Logger.d("[CastPlayerManager] subscribed: %s, mClient: %s", subscribed, mClient);
+    Logger.d("[CastPlayerManager] subscribed: %s, client: %s", subscribed, mClient);
     return subscribed && mClient != null;
   }
 
@@ -177,6 +181,7 @@ public interface CastListener {
     void onCastPlayerPlaylistAdvance(PlexMedia media);
     void onCastPlayerState(PlayerState state, PlexMedia media);
     void onCastConnectionFailed();
+    void onCastSeek();
     PlexMedia getNowPlayingMedia();
   };
 
@@ -186,6 +191,7 @@ public VideoCastManager getCastManager() {
 
   // This will send a message to the cast device to load the passed in media
   public void loadMedia(PlexMedia media, List<PlexMedia> album, final int offset) {
+    Logger.d("Loading media");
     nowPlayingMedia = media;
     nowPlayingAlbum = album;
     nowPlayingMedia.server.findServerConnection(new ActiveConnectionHandler() {
@@ -229,12 +235,13 @@ public void onSuccess(Connection connection) {
             obj.put(PARAMS.SRC, getTranscodeUrl(nowPlayingMedia, connection, seconds));
           obj.put(PARAMS.RESUME, VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.RESUME, false));
           sendMessage(obj);
+          listener.onCastSeek();
         } catch (Exception ex) {}
       }
 
       @Override
       public void onFailure(int statusCode) {
-
+        // TODO: Handle failure
       }
     });
   }
@@ -277,16 +284,17 @@ private void sendMessage(JSONObject obj) {
 
   private static VideoCastManager getCastManager(Context context) {
     if (null == castManager) {
-      castManager = VideoCastManager.initialize(context, BuildConfig.CHROMECAST_APP_ID,
-              null, "urn:x-cast:com.atomjack.vcfp");
-      castManager.enableFeatures(
-              VideoCastManager.FEATURE_NOTIFICATION |
-                      VideoCastManager.FEATURE_LOCKSCREEN |
-                      VideoCastManager.FEATURE_DEBUGGING);
+      VideoCastManager.initialize(context, BuildConfig.CHROMECAST_APP_ID,
+              null, "urn:x-cast:com.atomjack.vcfp")
+          .enableFeatures(
+                  VideoCastManager.FEATURE_NOTIFICATION |
+                          VideoCastManager.FEATURE_LOCKSCREEN |
+                          VideoCastManager.FEATURE_DEBUGGING);
 
     }
 //    castManager.setContext(context);
-    castManager.setStopOnDisconnect(true);
+    castManager = VideoCastManager.getInstance();
+    castManager.setStopOnDisconnect(false);
     return castManager;
   }
 
@@ -388,10 +396,9 @@ public void onApplicationStatusChanged(String appStatus) {
       }
 
       @Override
-      public boolean onApplicationConnectionFailed(int errorCode) {
+      public void onApplicationConnectionFailed(int errorCode) {
         Logger.d("[CastPlayerManager] onApplicationConnectionFailed: %d", errorCode);
         listener.onCastConnectionFailed();
-        return false;
       }
 
       @Override
@@ -408,6 +415,7 @@ public void onCastDeviceDetected(final MediaRouter.RouteInfo info) {
   }
 
   public String getTranscodeUrl(PlexMedia media, Connection connection, int offset) {
+    Logger.d("getTranscodeUrl, offset: %d", offset);
     String url = connection.uri;
     url += String.format("/%s/:/transcode/universal/start?", media instanceof PlexVideo ? "video" : "audio");
     QueryString qs = new QueryString("path", String.format("http://127.0.0.1:32400%s", media.key));
@@ -416,11 +424,13 @@ public String getTranscodeUrl(PlexMedia media, Connection connection, int offset
     qs.add("protocol", "http");
     qs.add("offset", Integer.toString(offset));
     qs.add("fastSeek", "1");
+//    String[] videoQuality = VoiceControlForPlexApplication.chromecastVideoOptions.get(VoiceControlForPlexApplication.getInstance().prefs.getString(connection.local ? Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL : Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE));
+//    qs.add("directPlay", videoQuality.length == 3 && videoQuality[2] == "1" ? "1" : "0");
     qs.add("directPlay", "0");
     qs.add("directStream", "1");
     qs.add("videoQuality", "60");
-    qs.add("videoResolution", "1024x768");
-    qs.add("maxVideoBitrate", "2000");
+    qs.add("maxVideoBitrate", VoiceControlForPlexApplication.chromecastVideoOptions.get(VoiceControlForPlexApplication.getInstance().prefs.getString(connection.local ? Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL : Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE))[0]);
+    qs.add("videoResolution", VoiceControlForPlexApplication.chromecastVideoOptions.get(VoiceControlForPlexApplication.getInstance().prefs.getString(connection.local ? Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL : Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE))[1]);
     qs.add("subtitleSize", "100");
     qs.add("audioBoost", "100");
     qs.add("session", mSessionId);
@@ -462,6 +472,7 @@ public JSONObject buildMedia(Connection connection, int offset) {
       data.put(PARAMS.CLIENT, VoiceControlForPlexApplication.gsonWrite.toJson(mClient));
       data.put(PARAMS.SRC, getTranscodeUrl(nowPlayingMedia, connection, offset));
       data.put(PARAMS.ACCESS_TOKEN, nowPlayingMedia.server.accessToken);
+      Logger.d("token: %s", nowPlayingMedia.server.accessToken);
       data.put(PARAMS.PLAYLIST, getPlaylistJson());
     } catch (Exception ex) {
       ex.printStackTrace();
@@ -477,6 +488,10 @@ public PlayerState getCurrentState() {
     return currentState;
   }
 
+  public void setNowPlayingMedia(PlexMedia nowPlayingMedia) {
+    this.nowPlayingMedia = nowPlayingMedia;
+  }
+
   public PlexMedia getNowPlayingMedia() {
     return nowPlayingMedia;
   }

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

@@ -22,7 +22,6 @@ public void onReceive(final Context context, final Intent intent)
 		if(queryText != null && queryText.matches(context.getResources().getString(R.string.pattern_recognition))) {
 			queryText = queryText.toLowerCase();
 			Intent sendIntent = new Intent(context, PlexSearchService.class);
-//			sendIntent.setAction("com.atomjack.vcfp.intent.ACTION_SEARCH");
 			sendIntent.putExtra(com.atomjack.shared.Intent.EXTRA_QUERYTEXT, queryText);
 			sendIntent.addFlags(Intent.FLAG_FROM_BACKGROUND);
 			sendIntent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);

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

@@ -1,6 +1,7 @@
 package com.atomjack.vcfp;
 
-import com.google.sample.castcompanionlibrary.cast.callbacks.VideoCastConsumerImpl;
+
+import com.google.android.libraries.cast.companionlibrary.cast.callbacks.VideoCastConsumerImpl;
 
 public class VCFPCastConsumer extends VideoCastConsumerImpl {
 	public void setOnConnected(Runnable runnable) {}

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

@@ -71,6 +71,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
@@ -99,12 +100,14 @@ public class VoiceControlForPlexApplication extends Application
 					.create();
 
   private NOTIFICATION_STATUS notificationStatus = NOTIFICATION_STATUS.off;
-  public static enum NOTIFICATION_STATUS {
+  public enum NOTIFICATION_STATUS {
     off,
     on,
     initializing
   }
 
+  public static HashMap<String, String[]> chromecastVideoOptions = new LinkedHashMap<>();
+
   private NotificationManager mNotifyMgr;
   private Bitmap notificationBitmap = null;
   private Bitmap notificationBitmapBig = null;
@@ -160,6 +163,22 @@ public void onCreate() {
     plexSubscription = new PlexSubscription();
     castPlayerManager = new CastPlayerManager(getApplicationContext());
 
+//    chromecastVideoOptions.put(getString(R.string.original), new String[]{"12000", "1920x1080", "1"}); // Disabled for now. Don't know how to get PMS to direct play to chromecast
+    chromecastVideoOptions.put("20mbps 720p", new String[]{"20000", "1280x720"});
+    chromecastVideoOptions.put("12mbps 720p", new String[]{"12000", "1280x720"});
+    chromecastVideoOptions.put("10mbps 720p", new String[]{"10000", "1280x720"});
+    chromecastVideoOptions.put("8mbps 720p", new String[]{"8000", "1280x720"});
+    chromecastVideoOptions.put("4mbps 720p", new String[]{"4000", "1280x720"});
+    chromecastVideoOptions.put("3mbps 720p", new String[]{"3000", "1280x720"});
+    chromecastVideoOptions.put("2mbps 720p", new String[]{"2000", "1280x720"});
+    chromecastVideoOptions.put("1.5mbps 720p", new String[]{"1500", "1280x720"});
+
+    if(VoiceControlForPlexApplication.getInstance().prefs.getString(Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL) == null)
+      VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL, "8mbps 720p");
+    if(VoiceControlForPlexApplication.getInstance().prefs.getString(Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE) == null)
+      VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE, "8mbps 720p");
+
+
     // Check for donate version, and if found, allow chromecast & wear
     PackageInfo pinfo;
     try