@@ -468,12 +468,7 @@ private void init() {
468
468
Fragment fragment ;
469
469
if (!doingFirstTimeSetup ) {
470
470
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 ();
477
472
478
473
server = gsonRead .fromJson (prefs .get (Preferences .SERVER , "" ), PlexServer .class );
479
474
if (server == null )
@@ -516,6 +511,17 @@ else if(musicPlayerFragment != null)
516
511
}
517
512
}
518
513
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
+
519
525
private void doTutorial () {
520
526
logger .d ("cast button: %s" , toolbar .findViewById (R .id .action_cast ));
521
527
if (toolbar .findViewById (R .id .action_cast ) == null ) {
@@ -869,6 +875,7 @@ public void onSuccess(PlexUser user) {
869
875
setupNavigationDrawer ();
870
876
refreshServers (null );
871
877
}
878
+ setupMediaRouter ();
872
879
}
873
880
874
881
@ Override
@@ -960,6 +967,7 @@ public void onSuccess(PlexUser user) {
960
967
setupNavigationDrawer ();
961
968
refreshServers (null );
962
969
}
970
+ setupMediaRouter ();
963
971
alertD .cancel ();
964
972
}
965
973
0 commit comments