Ubuntu One Android Music

Merge lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling into lp:~scottwferg/ubuntuone-android-music/last-fm-scrobbling

  1. last-fm-scrobbling
  2. Merge into last-fm-scrobbling
Proposed by Chad Miller
Status: Merged
Merged at revision: 448
Proposed branch: lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling
Merge into: lp:~scottwferg/ubuntuone-android-music/last-fm-scrobbling
Diff against target: 47 lines (+14/-2)
3 files modified
assets/html/en/index.html (+12/-0)
res/values/strings.xml (+1/-1)
src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java (+1/-1)
To merge this branch: bzr merge lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling
Reviewer Review Type Date Requested Status
Scott Ferguson Approve
Ubuntu One hackers Pending
Review via email: mp+37792@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Ferguson (scottwferg) wrote :

Merged in the changes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'assets/html/en/index.html'
2--- assets/html/en/index.html 2010-09-01 14:23:38 +0000
3+++ assets/html/en/index.html 2010-10-06 21:26:57 +0000
4@@ -30,5 +30,17 @@
5 <li>Includes photos and contacts sync for iPhone and Android devices.</li><!-- May need to alter depending on the delivery date of photos sync -->
6 </ul>
7
8+ <h2>Scrobbling</h2>
9+
10+ <p>If you use <a href="http://last.fm/">Last.fm</a> to track your music and get recommendations, then you can install an "scrobbling" app to to send playlist events. Ubuntu One Mobile Music Streaming supports a number of apps:</a></p>
11+
12+ <ul>
13+ <li><i><disableda href="http://market.android.com/details?id=com.adam.aslfms">Simple Last.fm Scrobbler</disableda></i></li>
14+ <li>official <i><disableda href="http://market.android.com/search?q=fm.last.android">Last.fm</disableda></i></li>
15+ </ul>
16+
17+ <p>To use, enable scrobbling in the Ubuntu One Mobile Music Streaming settings, after you install and set up a scrobbling app.</p>
18+
19+
20 </body>
21 </html>
22
23=== modified file 'res/values/strings.xml'
24--- res/values/strings.xml 2010-10-06 17:04:04 +0000
25+++ res/values/strings.xml 2010-10-06 21:26:57 +0000
26@@ -139,7 +139,7 @@
27 <string name="settings.cache_size_unlimited">Unlimited</string>
28 <string name="settings.lastfm_title">Last.fm</string>
29 <string name="settings.lastfm_scrobble">Scrobbling Support</string>
30- <string name="settings.lastfm_description">Enable Last.fm scrobbling</string>
31+ <string name="settings.lastfm_description">Report plays to Last.fm app (see Help)</string>
32
33 <string name="music_service.retry">A network error occurred. Retrying %d of %d.</string>
34
35
36=== modified file 'src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java'
37--- src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java 2010-10-06 18:56:28 +0000
38+++ src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java 2010-10-06 21:26:57 +0000
39@@ -589,7 +589,7 @@
40 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_NAME, Constants.LASTFM_APP_NAME);
41 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_PACKAGE, Constants.LASTFM_APP_PACKAGE);
42
43- if (this.currentPlaying != null) {
44+ if (currentPlaying != null && currentPlaying.getSong() != null) {
45 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_TRACK, currentPlaying.getSong().getTitle());
46 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ARTIST, currentPlaying.getSong().getArtist());
47 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ALBUM, currentPlaying.getSong().getAlbum());

Subscribers

People subscribed via source and target branches

to all changes: