From 519fdb7b0083f4c98a8122f173575d1a96ffb388 Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Mon, 17 Dec 2018 21:32:01 +0100
Subject: [PATCH] - Restart video play activity with correct data on trigger
 from notification

---
 app/build.gradle                                            | 4 ++--
 .../net/schueller/peertube/activity/VideoPlayActivity.java  | 6 +++---
 .../net/schueller/peertube/service/VideoPlayerService.java  | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 74ab3a8..d6c80a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 108
-        versionName "1.0.8"
+        versionCode 109
+        versionName "1.0.9"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         dependencies {
             implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index e4ee25d..b1cef54 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -206,14 +206,14 @@ public class VideoPlayActivity extends AppCompatActivity implements VideoRendere
     {
         // get video ID
         Intent intent = getIntent();
-        String videoID = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID);
-        Log.v(TAG, "click: " + videoID);
+        String videoUuid = intent.getStringExtra(VideoListActivity.EXTRA_VIDEOID);
+        Log.v(TAG, "click: " + videoUuid);
 
         // get video details from api
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
         GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
 
-        Call<Video> call = service.getVideoData(videoID);
+        Call<Video> call = service.getVideoData(videoUuid);
 
         call.enqueue(new Callback<Video>() {
             @Override
diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
index 5f6fcd1..2f42dd1 100644
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@@ -32,6 +32,7 @@ import net.schueller.peertube.model.Video;
 
 import static android.media.session.PlaybackState.ACTION_PAUSE;
 import static android.media.session.PlaybackState.ACTION_PLAY;
+import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;
 
 public class VideoPlayerService extends Service {
 
@@ -156,6 +157,7 @@ public class VideoPlayerService extends Service {
                     @Override
                     public PendingIntent createCurrentContentIntent(Player player) {
                         Intent intent = new Intent(context, VideoPlayActivity.class);
+                        intent.putExtra(EXTRA_VIDEOID, currentVideo.getUuid());
                         return PendingIntent.getActivity(context, 0, intent,
                                 PendingIntent.FLAG_UPDATE_CURRENT);
                     }
@@ -179,6 +181,9 @@ public class VideoPlayerService extends Service {
 
         playerNotificationManager.setSmallIcon(R.drawable.ic_peertube_bw);
 
+        // don't show skip buttons in notification
+        playerNotificationManager.setUseNavigationActions(false);
+
         playerNotificationManager.setNotificationListener(
                 new PlayerNotificationManager.NotificationListener() {
                     @Override