[Android] Resume media position with correct length

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Tue Oct  3 18:31:58 2017 +0200| [27e033bd4cbbd82f5593b80b6cbe498235605420] | committer: Geoffrey Métais

Resume media position with correct length

> https://code.videolan.org/videolan/vlc-android/commit/27e033bd4cbbd82f5593b80b6cbe498235605420
---

 .../src/org/videolan/vlc/PlaybackService.java      | 31 ++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java
index 3a86e0096..837c32e46 100644
--- a/vlc-android/src/org/videolan/vlc/PlaybackService.java
+++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java
@@ -605,12 +605,9 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
                 case MediaPlayer.Event.Playing:
                     mMedialibrary.pauseBackgroundOperations();
                     mStopped = false;
+                    final MediaWrapper mw = getCurrentMediaWrapper();
                     loadMediaMeta();
-                    if (mSavedTime > 0L) {
-                        if (mSavedTime < 0.95*getLength())
-                            seek(mSavedTime);
-                        mSavedTime = 0L;
-                    }
+                    seekToResume(mw);
 
                     Log.i(TAG, "MediaPlayer.Event.Playing");
                     executeUpdate();
@@ -627,8 +624,8 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
                         showNotification();
                     }
                     mVideoBackground = false;
-                    if (getCurrentMediaWrapper().getType() == MediaWrapper.TYPE_STREAM)
-                        mMedialibrary.addToHistory(getCurrentMediaLocation(), getCurrentMediaWrapper().getTitle());
+                    if (mw.getType() == MediaWrapper.TYPE_STREAM)
+                        mMedialibrary.addToHistory(getCurrentMediaLocation(), mw.getTitle());
                     break;
                 case MediaPlayer.Event.Paused:
                     mMedialibrary.resumeBackgroundOperations();
@@ -692,6 +689,24 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
                     callback.onMediaPlayerEvent(event);
             }
         }
+
+        private void seekToResume(MediaWrapper mw) {
+            if (mSavedTime > 0L) {
+                if (mSavedTime < 0.95*getLength())
+                    seek(mSavedTime);
+                mSavedTime = 0L;
+            } else {
+                final long length = getLength();
+                if (mw.getLength() <= 0L && length > 0L) {
+                    mw = mMedialibrary.findMedia(mw);
+                    if (mw.getId() != 0L) {
+                        mw.setTime((long) (mw.getMetaLong(MediaWrapper.META_PROGRESS) * (double) length) / 100L);
+                        if (mw.getTime() > 0L)
+                            seek(mw.getTime());
+                    }
+                }
+            }
+        }
     };
 
     private void onPlaybackStopped() {
@@ -721,7 +736,7 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
         if (canSwitchToVideo || media.isPodcast()) {
             //Save progress
             final long time = getTime();
-            final long length =  media.getLength();
+            final long length = getLength();
             float progress = time / (float)length;
             if (progress > 0.95f || (length-time) < 10000) {
                 //increase seen counter if more than 95% of the media have been seen