From 91b5941c7cc7f6f2298e6ae65cf3be2fe9eccd5b Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <egorr.berd@gmail.com>
Date: Tue, 12 Jun 2018 22:29:19 +0200
Subject: [PATCH] Fix bookmark doesn't restore saved song position.

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
---
 .../java/org/moire/ultrasonic/util/Util.java  | 43 ++++++-------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
index b1d12eac..90620e00 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/util/Util.java
@@ -21,11 +21,7 @@ package org.moire.ultrasonic.util;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.PendingIntent;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
+import android.content.*;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
@@ -49,33 +45,19 @@ import android.view.Gravity;
 import android.view.KeyEvent;
 import android.widget.RemoteViews;
 import android.widget.Toast;
-
 import org.moire.ultrasonic.R;
 import org.moire.ultrasonic.activity.DownloadActivity;
 import org.moire.ultrasonic.activity.MainActivity;
 import org.moire.ultrasonic.activity.SettingsActivity;
-import org.moire.ultrasonic.domain.Bookmark;
-import org.moire.ultrasonic.domain.MusicDirectory;
+import org.moire.ultrasonic.domain.*;
 import org.moire.ultrasonic.domain.MusicDirectory.Entry;
-import org.moire.ultrasonic.domain.PlayerState;
-import org.moire.ultrasonic.domain.RepeatMode;
-import org.moire.ultrasonic.domain.SearchResult;
-import org.moire.ultrasonic.domain.Version;
 import org.moire.ultrasonic.receiver.MediaButtonIntentReceiver;
 import org.moire.ultrasonic.service.DownloadFile;
 import org.moire.ultrasonic.service.DownloadService;
 import org.moire.ultrasonic.service.DownloadServiceImpl;
 import org.moire.ultrasonic.service.MusicServiceFactory;
 
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -928,17 +910,18 @@ public class Util extends DownloadActivity
 		return musicDirectory;
 	}
 
-	public static MusicDirectory getSongsFromBookmarks(Iterable<Bookmark> bookmarks)
-	{
-		MusicDirectory musicDirectory = new MusicDirectory();
+    public static MusicDirectory getSongsFromBookmarks(Iterable<Bookmark> bookmarks) {
+        MusicDirectory musicDirectory = new MusicDirectory();
 
-		for (Bookmark bookmark : bookmarks)
-		{
-			musicDirectory.addChild(bookmark.getEntry());
-		}
+        MusicDirectory.Entry song;
+        for (Bookmark bookmark : bookmarks) {
+            song = bookmark.getEntry();
+            song.setBookmarkPosition(bookmark.getPosition());
+            musicDirectory.addChild(song);
+        }
 
-		return musicDirectory;
-	}
+        return musicDirectory;
+    }
 
 	/**
 	 * <p>Broadcasts the given song info as the new song being played.</p>