Merge lp:~cjwatson/humpolec/sort-channels into lp:humpolec

[Colin Watson]

Sort the channel list.

It would make the channel list much easier to use if it were sorted.

(I confess I have not tested this. Hopefully it's reasonably obvious ...)

[Ondrej Kubik (ondrak)]

Yes, this could be good change.
I kept list deliberately as it is on the server but with number of channels growing, we should change our strategy.

review: Approve

Unmerged revisions

61. By Colin Watson on 2014-06-05

Sort the channel list.

60. By Ondrej Kubik on 2014-03-05

Bumping up version for release

=== modified file 'src/com/canonical/ubuntu/installer/InstallActivity.java'
--- src/com/canonical/ubuntu/installer/InstallActivity.java	2014-01-09 08:54:46 +0000
+++ src/com/canonical/ubuntu/installer/InstallActivity.java	2014-06-05 09:34:47 +0000
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
@@ -241,6 +242,7 @@
             } else if (0 != mAvailableChannels.size()) {
                 // get list of aliases as array
                 String channels[] = mAvailableChannels.keySet().toArray(new String[mAvailableChannels.size()]);
+                Arrays.sort(channels);
                 // look for "trusty" as default channel
                 int defSelection = channels.length/2;
                 for (int i = 0 ; i < channels.length ; ++i) {