Merge lp:~headbangerkenny/ubuntuone-android-music/branch into lp:ubuntuone-android-music

[Joe Simpson]

Shuffle Songs improvements -- headbangerkenny

Basically improves the UX a little, so that new users get "Buffering" while the app is loading the shuffled playlist and automatically plays after "Shuffle Songs" is selected.

[Chad Miller (cmiller)]

This is good, we definitely need feedback when waiting for the shuffle-queue to download. The shuffle buffer already starts playing, though.

MainActivity starts DownloadActivity, which checks the received intent for whether this is shuffle-play, and if it is, calls setShufflePlayEnabled(), which calls checkDownloads(), which calls checkShufflePlay(), which calls then play(0) IF it is the first time a shuffle-play has been started (id est, if shuffle play hasn't been stopped in the past).

On subsequent shuffle-play taps, should the music player do anything other than return the user to the place they were before? I need convincing it should do more.

I welcome the informational change for the user. With that only that change, I'd approve. Marking "Needs Fixing" to indicate that I so far don't want the other changes.

review: Needs Fixing

[lp:~headbangerkenny/ubuntuone-android-music/branch]

530. By Joe Simpson on 2011-08-20

Removed that play(0); code that was requested. However, I have moved the cache folder from /sdcard/subsonic to /sdcard/Android/data/net.sourceforge.subsonic.u1m/music because Android says we should do that. Also, I noticed on my device that the ShuffleBuffer would randomly be empty, so when that happens on get() I tell it to grab more tracks, which works (I end up waiting up to 15 mins for this to refill on my device otherwise)

[Joe Simpson (headbangerkenny)]

Okay, I've done that with a few changes for you to look at :)

[Chad Miller (cmiller)]

I want to add some of these ideas, but I don't want to add all of them. Please don't make a proposed merge a package-deal of disparate ideas, all-or-nothing. Branches are free! :) Put one idea in per branch.

I would probably have created branches

lp:~headbangerkenny/ubuntuone-android-music/shuffle-progress-information

lp:~headbangerkenny/ubuntuone-android-music/cache-in-official-suggested-folder

lp:~headbangerkenny/ubuntuone-android-music/shuffle-grab-more-tracks-on-empty

lp:~headbangerkenny/ubuntuone-android-music/automatically-resume-on-subsequent-shuffleplay

[Joe Simpson (headbangerkenny)]

Okay dokie, I'm new to launchpad and I'll remember this!
On Aug 22, 2011 2:08 PM, "Chad Miller" <email address hidden> wrote:
> I want to add some of these ideas, but I don't want to add all of them.
Please don't make a proposed merge a package-deal of disparate ideas,
all-or-nothing. Branches are free! :) Put one idea in per branch.
>
> I would probably have created branches
>
> lp:~headbangerkenny/ubuntuone-android-music/shuffle-progress-information
>
>
lp:~headbangerkenny/ubuntuone-android-music/cache-in-official-suggested-folder
>
>
lp:~headbangerkenny/ubuntuone-android-music/shuffle-grab-more-tracks-on-empty
>
>
lp:~headbangerkenny/ubuntuone-android-music/automatically-resume-on-subsequent-shuffleplay
> --
>
https://code.launchpad.net/~headbangerkenny/ubuntuone-android-music/branch/+merge/71364
> You are the owner of lp:~headbangerkenny/ubuntuone-android-music/branch.

[Chad Miller (cmiller)]

First, cheers on using File()s to create deep path, rather than succumbing to temptation to manually construct a string with slashes in it. I don't mind moving it to a standard location, but I wonder if it should be the standard "Music" directory instead. If you're going to move the location, you should handle old data and clean it up or move it, rather than abandoning it.

I don't think you mean a recurring Task in ShufflePlayBuffer.get() .

review: Needs Fixing

[Chad Miller (cmiller)]

First, cheers on using File()s to create deep path, rather than succumbing to temptation to manually construct a string with slashes in it. I don't mind moving it to a standard location, but I wonder if it should be the standard "Music" directory instead. If you're going to move the location, you should handle old data and clean it up or move it, rather than abandoning it.

I don't think you mean a recurring Task in ShufflePlayBuffer.get() .

review: Needs Fixing

Unmerged revisions

530. By Joe Simpson on 2011-08-20

Removed that play(0); code that was requested. However, I have moved the cache folder from /sdcard/subsonic to /sdcard/Android/data/net.sourceforge.subsonic.u1m/music because Android says we should do that. Also, I noticed on my device that the ShuffleBuffer would randomly be empty, so when that happens on get() I tell it to grab more tracks, which works (I end up waiting up to 15 mins for this to refill on my device otherwise)

529. By Joe Simpson on 2011-08-12

I have modified the Ubuntu One Music App so that when you tell it to Shuffle, it'll say it's buffering while the playlist is sorted out. Also it'll automatically play when pressing "Shuffle Songs" from the main screen.

528. By Chad Miller on 2011-08-08

Don't make non-ui events into Page Views in analytics.

527. By Chad Miller on 2011-08-08

When overriding Activities, be sure to call the superclass's same method. Android requires it.

526. By Michał Karnicki on 2011-08-03

Lower priority of media button receiver, unregister receiver when done.

525. By Chad Miller on 2011-08-02

Merge bad-index crash and trunk with analytics.

524. By Chad Miller on 2011-08-02

Don't dispatch automatically. We are going to use the network here, so dispatch only when we have the network active.

523. By Chad Miller on 2011-08-02

Revert bogus mistaken change to auth-return scheme.

522. By Chad Miller on 2011-08-02

Make analytics use more flag values, instead of magnitude values where appropriate.

Add analytics for cache miss and cache total-use. (Subtraction equals cache hit.)

Add analytics for free-space magnitude.

521. By Chad Miller on 2011-08-01

Make manual trackers dispatch events.

Make downloader start tracker correctly.

Add tracking to other Activities.

=== modified file 'res/values/styles.xml'
--- res/values/styles.xml	2011-04-21 21:13:18 +0000
+++ res/values/styles.xml	2011-08-20 12:08:25 +0000
@@ -12,14 +12,14 @@
 		<item name="android:textColor">@color/white</item>
 	</style>
 
-	<style name="Ubuntu.Title" parent="@android:style/WindowTitle">
+	<style name="Ubuntu.Title" parent="@android:style/TextAppearance.WindowTitle">
 		<item name="android:paddingLeft">14sp</item>
 		<item name="android:textColor">@color/white</item>
 		<item name="android:textStyle">normal</item>
 		<item name="android:textAppearance">@style/TextAppearance.WindowTitle</item>
 	</style>
 
-	<style name="Ubuntu.TitleBackground" parent="@android:style/WindowTitleBackground">
+	<style name="Ubuntu.TitleBackground">
 		<item name="android:background">@color/project</item>
 	</style>
 

=== modified file 'res/xml/appwidget_info.xml'
--- res/xml/appwidget_info.xml	2010-10-23 17:24:51 +0000
+++ res/xml/appwidget_info.xml	2011-08-20 12:08:25 +0000
@@ -3,4 +3,4 @@
                     a:minWidth="294dip"
                     a:minHeight="72dip"
                     a:updatePeriodMillis="0"
-                    a:initialLayout="@layout/appwidget"/>
\ No newline at end of file
+                    a:initialLayout="@layout/appwidget"/>

=== modified file 'src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java'
--- src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java	2011-07-30 11:51:09 +0000
+++ src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java	2011-08-20 12:08:25 +0000
@@ -199,8 +199,14 @@
         registerForContextMenu(playlistView);
 
         if (getIntent().getBooleanExtra(Constants.INTENT_EXTRA_NAME_SHUFFLE, false) && getDownloadService() != null) {
-            warnIfNetworkOrStorageUnavailable();
-            getDownloadService().setShufflePlayEnabled(true);
+            Thread t = new Thread("Refresh Random-Songs Cache") {
+                @Override
+                public void run() {
+                    warnIfNetworkOrStorageUnavailable();
+                    getDownloadService().setShufflePlayEnabled(true);
+                }
+            };
+            t.start();
         }
     }
 

=== modified file 'src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java'
--- src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java	2011-08-02 13:52:24 +0000
+++ src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java	2011-08-20 12:08:25 +0000
@@ -108,7 +108,7 @@
 
         MergeAdapter adapter = new MergeAdapter();
         adapter.addViews(Arrays.asList(serverButton, shuffleButton, settingsButton), true);
-        File subsonicDir = new File(Environment.getExternalStorageDirectory(), "subsonic");
+        File subsonicDir = new File(new File(new File(Environment.getExternalStorageDirectory(), "Android"), "data"), "net.sourceforge.subsonic.u1m");
         File debugFlagFile = new File(subsonicDir, "showdebugmenu");
         if (debugFlagFile.exists()) {
             Log.d(TAG, "Revealing debug settings button.");

=== modified file 'src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java'
--- src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java	2011-07-21 21:55:28 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java	2011-08-20 12:08:25 +0000
@@ -24,6 +24,7 @@
 import net.sourceforge.subsonic.androidapp.domain.Indexes;
 import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
 import net.sourceforge.subsonic.androidapp.domain.Playlist;
+import net.sourceforge.subsonic.androidapp.domain.PlayerState;
 import net.sourceforge.subsonic.androidapp.domain.Version;
 import net.sourceforge.subsonic.androidapp.domain.SearchResult;
 import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
@@ -151,6 +152,7 @@
         Thread t = new Thread("Refresh Random-Songs Cache") {
             @Override
             public void run() {
+                DownloadServiceImpl.getInstance().setPlayerState(PlayerState.PREPARING);
                 Log.i(TAG, "Getting new list of random songs in " + (sleepDuration/1000) + " seconds.");
                 if (sleepDuration != 0L) {
                     Log.i(TAG, "Not requesting new list of songs right away.");

=== modified file 'src/net/sourceforge/subsonic/androidapp/service/DownloadService.java'
--- src/net/sourceforge/subsonic/androidapp/service/DownloadService.java	2010-12-01 22:37:01 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/DownloadService.java	2011-08-20 12:08:25 +0000
@@ -67,6 +67,8 @@
 
     void reset();
 
+    public void setPlayerState(PlayerState playerState);
+
     PlayerState getPlayerState();
 
     int getPlayerPosition();

=== modified file 'src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java'
--- src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java	2011-08-02 13:52:24 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java	2011-08-20 12:08:25 +0000
@@ -450,7 +450,8 @@
         return playerState;
     }
 
-    private synchronized void setPlayerState(PlayerState playerState) {
+    @Override
+    public synchronized void setPlayerState(PlayerState playerState) {
         Log.i(TAG, this.playerState.name() + " -> " + playerState.name() + " (" + currentPlaying + ")");
 
         boolean show = this.playerState == PAUSED && playerState == PlayerState.STARTED;

=== modified file 'src/net/sourceforge/subsonic/androidapp/util/FileUtil.java'
--- src/net/sourceforge/subsonic/androidapp/util/FileUtil.java	2011-07-05 23:16:25 +0000
+++ src/net/sourceforge/subsonic/androidapp/util/FileUtil.java	2011-08-20 12:08:25 +0000
@@ -153,7 +153,8 @@
     }
 
     private static File createDirectory(String name) {
-        File subsonicDir = new File(Environment.getExternalStorageDirectory(), "subsonic");
+        // http://developer.android.com/guide/topics/data/data-storage.html#filesExternal states we should use this directory instead
+        File subsonicDir = new File(new File(new File(Environment.getExternalStorageDirectory(), "Android"), "data"), "net.sourceforge.subsonic.u1m");
         File dir = new File(subsonicDir, name);
         if (!dir.exists() && !dir.mkdirs()) {
             Log.e(TAG, "Failed to create " + name);

=== modified file 'src/net/sourceforge/subsonic/androidapp/util/ShufflePlayBuffer.java'
--- src/net/sourceforge/subsonic/androidapp/util/ShufflePlayBuffer.java	2011-07-22 19:01:22 +0000
+++ src/net/sourceforge/subsonic/androidapp/util/ShufflePlayBuffer.java	2011-08-20 12:08:25 +0000
@@ -29,6 +29,8 @@
 import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
 import net.sourceforge.subsonic.androidapp.service.MusicService;
 import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
+import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
+import net.sourceforge.subsonic.androidapp.domain.PlayerState;
 
 /**
  * @author Sindre Mehus
@@ -69,6 +71,7 @@
     }
 
     public List<MusicDirectory.Entry> get(int size) {
+        DownloadServiceImpl.getInstance().setPlayerState(PlayerState.PREPARING);
         clearBufferIfnecessary();
 
         List<MusicDirectory.Entry> result = new ArrayList<MusicDirectory.Entry>(size);
@@ -77,6 +80,15 @@
                 result.add(buffer.remove(buffer.size() - 1));
             }
         }
+        if(buffer.size() == 0 && result.size() == 0) { // my phone likes to be empty.... let's fill it up
+                Runnable runnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        refill();
+                    }
+                };
+                executorService.scheduleWithFixedDelay(runnable, 1, 3, TimeUnit.SECONDS);
+        }
         Log.i(TAG, "Taking " + result.size() + " songs from shuffle-play buffer. " + buffer.size() + " remaining.");
         return result;
     }