Skip to content

Commit f0ab763

Browse files
author
Chris Bellew
committed
Disconnect from subscribed client automatically after a certain number of heartbeats fail (in case the client went away). Optimized display of notifications so notification shows up before thumb is downloaded. Show connecting dialog on chromecast. Added separate notification layout for music.
1 parent 19c784c commit f0ab763

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@ protected void onCreate(Bundle savedInstanceState) {
5050
Logger.d("found saved instance state");
5151
nowPlayingMedia = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
5252
mClient = savedInstanceState.getParcelable(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
53-
Logger.d("[NowPlayingActivity] 1 set mClient: %s", mClient);
5453
} else {
5554
nowPlayingMedia = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_MEDIA);
5655
mClient = getIntent().getParcelableExtra(VoiceControlForPlexApplication.Intent.EXTRA_CLIENT);
57-
Logger.d("[NowPlayingActivity] 2 set mClient: %s", mClient);
5856
}
5957

6058
if(mClient == null || nowPlayingMedia == null)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ protected void onDestroy() {
8888
@Override
8989
public void onSubscribed(PlexClient _client) {
9090
mClient = _client;
91-
Logger.d("[SubscriptionActivity] set mClient: %s", mClient);
9291
// Do nothing
9392
}
9493

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ protected void onCreate(Bundle savedInstanceState) {
139139
if(plexSubscription.isSubscribed()) {
140140
Logger.d("VCFPActivity setting client to %s", plexSubscription.mClient);
141141
mClient = plexSubscription.mClient;
142-
Logger.d("[VCFPActivity] 2 set mClient: %s", mClient);
143142
} else {
144143
Logger.d("Not subscribed: %s", plexSubscription.mClient);
145144
}
@@ -155,7 +154,6 @@ protected void onCreate(Bundle savedInstanceState) {
155154
castPlayerManager.setContext(this);
156155
if(castPlayerManager.isSubscribed()) {
157156
mClient = castPlayerManager.mClient;
158-
Logger.d("[VCFPActivity] 3 set mClient: %s", mClient);
159157
}
160158

161159
if(BuildConfig.USE_BUGSENSE)
@@ -273,7 +271,6 @@ public void onDeviceSelected(PlexDevice device, boolean resume) {
273271
if (clientSelected.isCastClient) {
274272
if(VoiceControlForPlexApplication.getInstance().hasChromecast()) {
275273
mClient = clientSelected;
276-
Logger.d("[VCFPActivity] 3 set mClient: %s", mClient);
277274
Logger.d("[VCPActivity] subscribing");
278275
castPlayerManager.subscribe(mClient);
279276
} else {
@@ -413,7 +410,6 @@ public void onCastPlayerState(PlayerState state, PlexMedia media) {
413410
if(!mCurrentState.equals(PlayerState.STOPPED) && media != null) {
414411
nowPlayingMedia = media;
415412
mClient = castPlayerManager.mClient;
416-
Logger.d("[VCFPActivity] 1 set mClient: %s", mClient);
417413
// TODO: only set notification here if it's already on?
418414
VoiceControlForPlexApplication.getInstance().setNotification(mClient, mCurrentState, nowPlayingMedia);
419415
}
@@ -588,7 +584,6 @@ public void setThumb() {
588584
Logger.d("setThumb: %s", thumb);
589585
if(nowPlayingMedia instanceof PlexVideo) {
590586
PlexVideo video = (PlexVideo)nowPlayingMedia;
591-
Logger.d("grandparentThumb: %s", nowPlayingMedia.grandparentThumb);
592587
thumb = video.isMovie() || video.isClip() ? video.thumb : video.grandparentThumb;
593588
Logger.d("orientation: %s, type: %s", getOrientation(), video.type);
594589
if(video.isClip()) {

0 commit comments

Comments
 (0)