Merge lp:~cmiller/ubuntuone-android-music/last-fm-scrobbling into lp:~scottwferg/ubuntuone-android-music/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
=== modified file 'assets/html/en/index.html'
--- assets/html/en/index.html 2010-09-01 14:23:38 +0000
+++ assets/html/en/index.html 2010-10-06 21:26:57 +0000
@@ -30,5 +30,17 @@
30 <li>Includes photos and contacts sync for iPhone and Android devices.</li><!-- May need to alter depending on the delivery date of photos sync -->30 <li>Includes photos and contacts sync for iPhone and Android devices.</li><!-- May need to alter depending on the delivery date of photos sync -->
31</ul>31</ul>
3232
33 <h2>Scrobbling</h2>
34
35 <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>
36
37 <ul>
38 <li><i><disableda href="http://market.android.com/details?id=com.adam.aslfms">Simple Last.fm Scrobbler</disableda></i></li>
39 <li>official <i><disableda href="http://market.android.com/search?q=fm.last.android">Last.fm</disableda></i></li>
40 </ul>
41
42 <p>To use, enable scrobbling in the Ubuntu One Mobile Music Streaming settings, after you install and set up a scrobbling app.</p>
43
44
33</body>45</body>
34</html>46</html>
3547
=== modified file 'res/values/strings.xml'
--- res/values/strings.xml 2010-10-06 17:04:04 +0000
+++ res/values/strings.xml 2010-10-06 21:26:57 +0000
@@ -139,7 +139,7 @@
139 <string name="settings.cache_size_unlimited">Unlimited</string>139 <string name="settings.cache_size_unlimited">Unlimited</string>
140 <string name="settings.lastfm_title">Last.fm</string>140 <string name="settings.lastfm_title">Last.fm</string>
141 <string name="settings.lastfm_scrobble">Scrobbling Support</string>141 <string name="settings.lastfm_scrobble">Scrobbling Support</string>
142 <string name="settings.lastfm_description">Enable Last.fm scrobbling</string>142 <string name="settings.lastfm_description">Report plays to Last.fm app (see Help)</string>
143143
144 <string name="music_service.retry">A network error occurred. Retrying %d of %d.</string>144 <string name="music_service.retry">A network error occurred. Retrying %d of %d.</string>
145145
146146
=== modified file 'src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java'
--- src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java 2010-10-06 18:56:28 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java 2010-10-06 21:26:57 +0000
@@ -589,7 +589,7 @@
589 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_NAME, Constants.LASTFM_APP_NAME);589 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_NAME, Constants.LASTFM_APP_NAME);
590 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_PACKAGE, Constants.LASTFM_APP_PACKAGE);590 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_APP_PACKAGE, Constants.LASTFM_APP_PACKAGE);
591591
592 if (this.currentPlaying != null) {592 if (currentPlaying != null && currentPlaying.getSong() != null) {
593 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_TRACK, currentPlaying.getSong().getTitle());593 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_TRACK, currentPlaying.getSong().getTitle());
594 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ARTIST, currentPlaying.getSong().getArtist());594 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ARTIST, currentPlaying.getSong().getArtist());
595 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ALBUM, currentPlaying.getSong().getAlbum());595 lastfm.putExtra(Constants.INTENT_EXTRA_LASTFM_ALBUM, currentPlaying.getSong().getAlbum());

Subscribers

People subscribed via source and target branches

to all changes: