baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 8 Packages Wiki Activity

possible fix for expandedView bug in BackgroundPlayer

Browse source
This commit is contained in:
Adam Howard 2016-01-04 01:15:13 +00:00
parent 95b73f35f7
commit c07686576a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/schabi/newpipe/BackgroundPlayer.java
View file

@ -181,6 +181,8 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
openDetailView.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId); openDetailView.putExtra(VideoItemDetailFragment.STREAMING_SERVICE, serviceId);
openDetailView.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl); openDetailView.putExtra(VideoItemDetailFragment.VIDEO_URL, webUrl);
openDetailView.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); openDetailView.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
note.contentIntent = PendingIntent.getActivity(getApplicationContext(), note.contentIntent = PendingIntent.getActivity(getApplicationContext(),
noteID, openDetailView, noteID, openDetailView,
PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
@ -204,6 +206,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
}*/ }*/
} }
/**Handles button presses from the notification. */
private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
@ -214,7 +217,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
mediaPlayer.pause(); mediaPlayer.pause();
} }
else { else {
//reacquire CPU lock after releasing it on pause //reacquire CPU lock after auto-releasing it on pause
mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK); mediaPlayer.setWakeMode(getApplicationContext(), PowerManager.PARTIAL_WAKE_LOCK);
mediaPlayer.start(); mediaPlayer.start();
} }
@ -228,8 +231,9 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
}; };
private void afterPlayCleanup() { private void afterPlayCleanup() {
//noteBuilder.setProgress(0, 0, false);
//remove progress bar //remove progress bar
//noteBuilder.setProgress(0, 0, false);
//remove notification //remove notification
noteMgr.cancel(noteID); noteMgr.cancel(noteID);
unregisterReceiver(broadcastReceiver); unregisterReceiver(broadcastReceiver);
@ -238,7 +242,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
//release wifilock //release wifilock
wifiLock.release(); wifiLock.release();
//remove foreground status of service; make us killable //remove foreground status of service; make BackgroundPlayer killable
stopForeground(true); stopForeground(true);
stopSelf(); stopSelf();
@ -289,6 +293,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
noteBuilder noteBuilder
.setContentTitle(title) .setContentTitle(title)
//really? Id like to put something more helpful here. //really? Id like to put something more helpful here.
//was more of a placeholder than anything else. -medavox
//.setContentText("NewPipe is playing in the background") //.setContentText("NewPipe is playing in the background")
.setContentText(channelName) .setContentText(channelName)
//.setAutoCancel(!mediaPlayer.isPlaying()) //.setAutoCancel(!mediaPlayer.isPlaying())
@ -300,6 +305,8 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
//.setVisibility(NotificationCompat.VISIBILITY_PUBLIC) //.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
//.setLargeIcon(cover) //.setLargeIcon(cover)
//is wrapping this in an SDK version check really necessary,
// if we're using NotificationCompat? -medavox
if (android.os.Build.VERSION.SDK_INT >= 16) if (android.os.Build.VERSION.SDK_INT >= 16)
noteBuilder.setPriority(Notification.PRIORITY_LOW); noteBuilder.setPriority(Notification.PRIORITY_LOW);
@ -313,6 +320,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
} }
note = noteBuilder.build(); note = noteBuilder.build();
} else { } else {
//Log.i(TAG, "API is version 21 or above");
RemoteViews view = RemoteViews view =
new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification); new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification);
view.setImageViewBitmap(R.id.backgroundCover, videoThumbnail); view.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
@ -321,8 +329,10 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
view.setOnClickPendingIntent(R.id.backgroundStop, stopPI); view.setOnClickPendingIntent(R.id.backgroundStop, stopPI);
view.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI); view.setOnClickPendingIntent(R.id.backgroundPlayPause, playPI);
//possibly found the expandedView problem,
//but can't test it as I don't have a 5.0 device. -medavox
RemoteViews expandedView = RemoteViews expandedView =
new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification); new RemoteViews(BuildConfig.APPLICATION_ID, R.layout.player_notification_expanded);
expandedView.setImageViewBitmap(R.id.backgroundCover, videoThumbnail); expandedView.setImageViewBitmap(R.id.backgroundCover, videoThumbnail);
expandedView.setTextViewText(R.id.backgroundSongName, title); expandedView.setTextViewText(R.id.backgroundSongName, title);
expandedView.setTextViewText(R.id.backgroundArtist, channelName); expandedView.setTextViewText(R.id.backgroundArtist, channelName);