Merge pull request #5228 from B0pol/share_ts

Remove timestamp from share url for all services except youtube
TeamNewPipe · Dec 20, 2020 · 0c656ab · 0c656ab
2 parents a786cff + 7a7a90b
commit 0c656ab
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -103,6 +103,7 @@
 
 import java.util.List;
 
+import static org.schabi.newpipe.extractor.ServiceList.YouTube;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_CLOSE;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_FORWARD;
 import static org.schabi.newpipe.player.MainPlayer.ACTION_FAST_REWIND;
@@ -889,10 +890,17 @@ private void onMoreOptionsClicked() {
     private void onShareClicked() {
         // share video at the current time (youtube.com/watch?v=ID&t=SECONDS)
         // Timestamp doesn't make sense in a live stream so drop it
-        final String ts = isLive() ? "" : ("&t=" + (getPlaybackSeekBar().getProgress() / 1000));
+
+        final int ts = getPlaybackSeekBar().getProgress() / 1000;
+        final MediaSourceTag metadata = getCurrentMetadata();
+        String videoUrl = getVideoUrl();
+        if (!isLive() && ts >= 0 && metadata != null
+                && metadata.getMetadata().getServiceId() == YouTube.getServiceId()) {
+            videoUrl += ("&t=" + ts);
+        }
         ShareUtils.shareUrl(service,
                 getVideoTitle(),
-                getVideoUrl() + ts);
+                videoUrl);
     }
 
     private void onPlayWithKodiClicked() {