Skip to content

Commit 92dc2b3

Browse files
author
Chris Bellew
committed
Setup chromecast media router after logging in so that chromecasts are available upon first load of the main screen.
1 parent 7d3d8db commit 92dc2b3

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -468,12 +468,7 @@ private void init() {
468468
Fragment fragment;
469469
if (!doingFirstTimeSetup) {
470470

471-
mMediaRouter = MediaRouter.getInstance(getApplicationContext());
472-
mMediaRouteSelector = new MediaRouteSelector.Builder()
473-
.addControlCategory(CastMediaControlIntent.categoryForCast(BuildConfig.CHROMECAST_APP_ID))
474-
.build();
475-
mMediaRouterCallback = new MediaRouterCallback();
476-
mMediaRouter.addCallback(mMediaRouteSelector, mMediaRouterCallback, MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
471+
setupMediaRouter();
477472

478473
server = gsonRead.fromJson(prefs.get(Preferences.SERVER, ""), PlexServer.class);
479474
if (server == null)
@@ -516,6 +511,17 @@ else if(musicPlayerFragment != null)
516511
}
517512
}
518513

514+
private void setupMediaRouter() {
515+
if(mMediaRouter == null) {
516+
mMediaRouter = MediaRouter.getInstance(getApplicationContext());
517+
mMediaRouteSelector = new MediaRouteSelector.Builder()
518+
.addControlCategory(CastMediaControlIntent.categoryForCast(BuildConfig.CHROMECAST_APP_ID))
519+
.build();
520+
mMediaRouterCallback = new MediaRouterCallback();
521+
mMediaRouter.addCallback(mMediaRouteSelector, mMediaRouterCallback, MediaRouter.CALLBACK_FLAG_PERFORM_ACTIVE_SCAN);
522+
}
523+
}
524+
519525
private void doTutorial() {
520526
logger.d("cast button: %s", toolbar.findViewById(R.id.action_cast));
521527
if(toolbar.findViewById(R.id.action_cast) == null) {
@@ -869,6 +875,7 @@ public void onSuccess(PlexUser user) {
869875
setupNavigationDrawer();
870876
refreshServers(null);
871877
}
878+
setupMediaRouter();
872879
}
873880

874881
@Override
@@ -960,6 +967,7 @@ public void onSuccess(PlexUser user) {
960967
setupNavigationDrawer();
961968
refreshServers(null);
962969
}
970+
setupMediaRouter();
963971
alertD.cancel();
964972
}
965973

0 commit comments

Comments
 (0)