aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-11-12 18:46:19 -0800
committerScott Jackson <daneren2005@gmail.com>2013-11-12 18:46:19 -0800
commit5f97130b706983684ff22342f4223f966f94c08e (patch)
treee9d6f6f2b77b9e3e960dbd67d36b1e3c275f49a5
parent48b6a05198889ac4a3f594c4715cb83d1a58d3a7 (diff)
downloaddsub-5f97130b706983684ff22342f4223f966f94c08e.tar.gz
dsub-5f97130b706983684ff22342f4223f966f94c08e.tar.bz2
dsub-5f97130b706983684ff22342f4223f966f94c08e.zip
Fixed web commits
-rw-r--r--src/github/daneren2005/dsub/fragments/DownloadFragment.java4
-rw-r--r--src/github/daneren2005/dsub/view/BookmarkAdapter.java6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index c4597e78..682319f1 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -1152,7 +1152,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
return;
}
- DownloadFile currentDownload = downloadService.getCurrentPlaying();
+ final DownloadFile currentDownload = downloadService.getCurrentPlaying();
if(currentDownload == null) {
return;
}
@@ -1175,7 +1175,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
AlertDialog dialog = builder.create();
dialog.show();
}
- private void createBookmark(DownloadFile currentDownload, String comment) {
+ private void createBookmark(final DownloadFile currentDownload, final String comment) {
new SilentBackgroundTask<Void>(context) {
@Override
protected Void doInBackground() throws Throwable {
diff --git a/src/github/daneren2005/dsub/view/BookmarkAdapter.java b/src/github/daneren2005/dsub/view/BookmarkAdapter.java
index 2ea7bf73..bcddc574 100644
--- a/src/github/daneren2005/dsub/view/BookmarkAdapter.java
+++ b/src/github/daneren2005/dsub/view/BookmarkAdapter.java
@@ -25,8 +25,12 @@ import java.util.List;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import github.daneren2005.dsub.R;
import github.daneren2005.dsub.domain.Bookmark;
import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.Util;
public class BookmarkAdapter extends ArrayAdapter<Bookmark> {
private final static String TAG = BookmarkAdapter.class.getSimpleName();
@@ -51,7 +55,7 @@ public class BookmarkAdapter extends ArrayAdapter<Bookmark> {
// Add current position to duration
TextView durationTextView = (TextView) view.findViewById(R.id.song_duration);
String duration = durationTextView.getText().toString();
- durationTextView.setText(Util.formatDuration(bookmark.getPosition()) + " / " + duration);
+ durationTextView.setText(Util.formatDuration(bookmark.getPosition() / 1000) + " / " + duration);
return view;
}