Fix addons content sort

Don't specify a sort method in the listing of addon contents, so that the addon can sort its contents as it sees fit.

app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java

@@ -60,12 +60,12 @@ public class Files {
      * Enums for File.Media
      */
     public interface Media {
-        public final static String VIDEO = "video";
+        String VIDEO = "video";
-        public final static String MUSIC = "music";
+        String MUSIC = "music";
-        public final static String PICTURES = "pictures";
+        String PICTURES = "pictures";
-        public final static String FILES =  "files";
+        String FILES =  "files";
-        public final static String PROGRAMS =  "programs";
+        String PROGRAMS =  "programs";
-        public final static String[] allValues = new String[] {
+        String[] allValues = new String[] {
                 VIDEO, MUSIC, PICTURES, FILES, PROGRAMS
         };
     }
@@ -96,7 +96,7 @@ public class Files {
             ArrayNode items = resultNode.has(SOURCE_NODE) ?
                     (ArrayNode) resultNode.get(SOURCE_NODE) : null;
             if (items == null) {
-                return new ArrayList<ItemType.Source>(0);
+                return new ArrayList<>(0);
             }
             ArrayList<ItemType.Source> result = new ArrayList<ItemType.Source>(items.size());
 
@@ -115,17 +115,6 @@ public class Files {
         public final static String SORT_NODE = "sort";
         public final static String FILE_NODE = "files";
 
-        /**
-         * Get the directories and files in the given directory
-         * @param directory          full path name
-         * @param sort_params   sorting criteria
-         */
-        public GetDirectory(String directory, ListType.Sort sort_params) {
-            super();
-            addParameterToRequest("directory", directory);
-            addParameterToRequest(SORT_NODE, sort_params.toJsonNode());
-        }
-
         /**
          * Get the directories and files in the given directory
          * @param directory Full path name
@@ -141,7 +130,9 @@ public class Files {
             addParameterToRequest("directory", directory);
             addParameterToRequest("media", media);
             addParameterToRequest("properties", properties);
-            addParameterToRequest(SORT_NODE, sort_params.toJsonNode());
+            if (sort_params != null) {
+                addParameterToRequest(SORT_NODE, sort_params.toJsonNode());
+            }
         }
 
         @Override
@@ -152,10 +143,10 @@ public class Files {
             JsonNode fileNode = jsonObject.get(RESULT_NODE)
                     .get(FILE_NODE);
             if (fileNode == null || fileNode.isNull()) {
-                return new ArrayList<ListType.ItemFile>(0);
+                return new ArrayList<>(0);
             }
             ArrayNode items = (ArrayNode) fileNode;
-            ArrayList<ListType.ItemFile> result = new ArrayList<ListType.ItemFile>(items.size());
+            ArrayList<ListType.ItemFile> result = new ArrayList<>(items.size());
             for (JsonNode item : items) {
                 String regex = "\\[.*?\\]";
                 JsonNode label = item.get("label");

app/src/main/java/org/xbmc/kore/jsonrpc/type/ListType.java

@@ -15,6 +15,9 @@
  */
 package org.xbmc.kore.jsonrpc.type;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -580,7 +583,7 @@ public class ListType {
     /**
      * List.Sort
      */
-    public static class Sort implements ApiParameter {
+    public static class Sort implements ApiParameter, Parcelable {
         public static final String SORT_METHOD_NONE = "none";
         public static final String SORT_METHOD_LABEL = "label";
         public static final String SORT_METHOD_DATE = "date";
@@ -588,7 +591,7 @@ public class ListType {
         public static final String SORT_METHOD_FILE = "file";
         public static final String SORT_METHOD_PATH = "path";
         public static final String SORT_METHOD_DRIVETYPE = "drivetype";
-        public static final String SORT_METHOD_TYPE = "title";
+        public static final String SORT_METHOD_TITLE = "title";
         public static final String SORT_METHOD_TRACK = "track";
         public static final String SORT_METHOD_TIME = "time";
         public static final String SORT_METHOD_ARTIST = "artist";
@@ -643,5 +646,31 @@ public class ListType {
             node.put(METHOD, sort_method);
             return node;
         }
+
+        private Sort(Parcel in) {
+            this.sort_method = in.readString();
+            this.ascending_order = (in.readInt() != 0);
+            this.ignore_article = (in.readInt() != 0);
+        }
+
+        public int describeContents() {
+            return 0;
+        }
+
+        public void writeToParcel(Parcel out, int flags) {
+            out.writeString(sort_method);
+            out.writeInt(ascending_order ? 1 : 0);
+            out.writeInt(ignore_article ? 1 : 0);
+        }
+
+        public static final Parcelable.Creator<Sort> CREATOR = new Parcelable.Creator<Sort>() {
+            public Sort createFromParcel(Parcel in) {
+                return new Sort(in);
+            }
+
+            public Sort[] newArray(int size) {
+                return new Sort[size];
+            }
+        };
     }
 }

app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListContainerFragment.java

@@ -22,6 +22,8 @@ import android.preference.PreferenceManager;
 import org.xbmc.kore.R;
 import org.xbmc.kore.Settings;
 import org.xbmc.kore.host.HostManager;
+import org.xbmc.kore.jsonrpc.method.Files;
+import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.ui.AbstractInfoFragment;
 import org.xbmc.kore.ui.AbstractTabsFragment;
 import org.xbmc.kore.ui.sections.file.MediaFileListFragment;
@@ -46,7 +48,7 @@ public class AddonListContainerFragment extends AbstractTabsFragment {
         if (arguments == null)
             arguments = new Bundle();
 
-        /**
+        /*
          * Following check required to support testing AddonsActivity.
          * The database with host info is setup after initializing AddonsActivity using
          * ActivityTestRule from the test support library. This means getHostInfo() will
@@ -66,6 +68,7 @@ public class AddonListContainerFragment extends AbstractTabsFragment {
             String name = prefs.getString(Settings.getNameBookmarkedAddonsPrefKey(hostId) + path, Settings.DEFAULT_PREF_NAME_BOOKMARKED_ADDON);
             arguments.putParcelable(MediaFileListFragment.ROOT_PATH,
                                     new MediaFileListFragment.FileLocation(name, "plugin://" + path, true));
+            arguments.putString(MediaFileListFragment.MEDIA_TYPE, Files.Media.FILES);
             tabsAdapter.addTab(MediaFileListFragment.class, arguments, name, ++baseFragmentId);
         }
 

app/src/main/java/org/xbmc/kore/ui/sections/file/FileListFragment.java

@@ -20,6 +20,7 @@ import android.os.Bundle;
 
 import org.xbmc.kore.R;
 import org.xbmc.kore.jsonrpc.method.Files;
+import org.xbmc.kore.jsonrpc.type.ListType;
 import org.xbmc.kore.ui.AbstractTabsFragment;
 import org.xbmc.kore.ui.OnBackPressedListener;
 import org.xbmc.kore.utils.TabsAdapter;
@@ -32,12 +33,20 @@ public class FileListFragment extends AbstractTabsFragment
 
     @Override
     protected TabsAdapter createTabsAdapter(DataHolder dataHolder) {
+        ListType.Sort sortMethod = new ListType.Sort(ListType.Sort.SORT_METHOD_PATH, true, true);
+
         Bundle videoFileListArgs = new Bundle();
         videoFileListArgs.putString(MediaFileListFragment.MEDIA_TYPE, Files.Media.VIDEO);
+        videoFileListArgs.putParcelable(MediaFileListFragment.SORT_METHOD, sortMethod);
+
         Bundle musicFileListArgs = new Bundle();
         musicFileListArgs.putString(MediaFileListFragment.MEDIA_TYPE, Files.Media.MUSIC);
+        musicFileListArgs.putParcelable(MediaFileListFragment.SORT_METHOD, sortMethod);
+
         Bundle pictureFileListArgs = new Bundle();
         pictureFileListArgs.putString(MediaFileListFragment.MEDIA_TYPE, Files.Media.PICTURES);
+        pictureFileListArgs.putParcelable(MediaFileListFragment.SORT_METHOD, sortMethod);
+
         return new TabsAdapter(getActivity(), getChildFragmentManager())
                 .addTab(MediaFileListFragment.class, videoFileListArgs, R.string.video, 1)
                 .addTab(MediaFileListFragment.class, musicFileListArgs, R.string.music, 2)

app/src/main/java/org/xbmc/kore/ui/sections/file/MediaFileListFragment.java

@@ -61,6 +61,7 @@ public class MediaFileListFragment extends AbstractListFragment {
     private static final String TAG = LogUtils.makeLogTag(MediaFileListFragment.class);
 
     public static final String MEDIA_TYPE = "mediaType";
+    public static final String SORT_METHOD = "sortMethod";
     public static final String PATH_CONTENTS = "pathContents";
     public static final String ROOT_PATH_CONTENTS = "rootPathContents";
     public static final String ROOT_VISITED = "rootVisited";
@@ -74,32 +75,22 @@ public class MediaFileListFragment extends AbstractListFragment {
      */
     private Handler callbackHandler = new Handler();
 
-    String mediaType = Files.Media.MUSIC;
+    String mediaType = Files.Media.FILES;
+    ListType.Sort sortMethod = null;
     String parentDirectory = null;
     int playlistId = PlaylistType.MUSIC_PLAYLISTID;             // this is the ID of the music player
 //    private MediaFileListAdapter adapter = null;
     boolean browseRootAlready = false;
     FileLocation loadOnVisible = null;
 
-    ArrayList<FileLocation> rootFileLocation = new ArrayList<FileLocation>();
+    ArrayList<FileLocation> rootFileLocation = new ArrayList<>();
     Queue<FileLocation> mediaQueueFileLocation = new LinkedList<>();
 
-//    @InjectView(R.id.list) GridView folderGridView;
-//    @InjectView(R.id.swipe_refresh_layout) SwipeRefreshLayout swipeRefreshLayout;
-//    @InjectView(android.R.id.empty) TextView emptyView;
-
-    public static MediaFileListFragment newInstance(final String media) {
-        MediaFileListFragment fragment = new MediaFileListFragment();
-        Bundle args = new Bundle();
-        args.putString(MEDIA_TYPE, media);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putString(MEDIA_TYPE, mediaType);
+        outState.putParcelable(SORT_METHOD, sortMethod);
         try {
             outState.putParcelableArrayList(PATH_CONTENTS, (ArrayList<FileLocation>) ((MediaFileListAdapter) getAdapter()).getFileItemList());
         } catch (NullPointerException npe) {
@@ -138,6 +129,7 @@ public class MediaFileListFragment extends AbstractListFragment {
             } else if (mediaType.equalsIgnoreCase(Files.Media.PICTURES)) {
                 playlistId = PlaylistType.PICTURE_PLAYLISTID;
             }
+            sortMethod = args.getParcelable(SORT_METHOD);
         }
 
         hostManager = HostManager.getInstance(getActivity());
@@ -151,13 +143,14 @@ public class MediaFileListFragment extends AbstractListFragment {
         });
 
         if (savedInstanceState != null) {
-            mediaType = savedInstanceState.getString(MEDIA_TYPE);
+            mediaType = savedInstanceState.getString(MEDIA_TYPE, Files.Media.FILES);
             //currentPath = savedInstanceState.getString(CURRENT_PATH);
             if (mediaType.equalsIgnoreCase(Files.Media.VIDEO)) {
                 playlistId = PlaylistType.VIDEO_PLAYLISTID;
             } else if (mediaType.equalsIgnoreCase(Files.Media.PICTURES)) {
                 playlistId = PlaylistType.PICTURE_PLAYLISTID;
             }
+            sortMethod = savedInstanceState.getParcelable(SORT_METHOD);
             ArrayList<FileLocation> list = savedInstanceState.getParcelableArrayList(PATH_CONTENTS);
             rootFileLocation = savedInstanceState.getParcelableArrayList(ROOT_PATH_CONTENTS);
             browseRootAlready = savedInstanceState.getBoolean(ROOT_VISITED);
@@ -217,7 +210,8 @@ public class MediaFileListFragment extends AbstractListFragment {
             return true;
         else
             // if we still see "..", it is not the real root directory
-            return fl.isRootDir() && (fl.title.contentEquals("..") == false);
+            return fl.isRootDir() &&
+                   (fl.title != null) && !fl.title.contentEquals("..");
     }
 
     /**
@@ -234,7 +228,8 @@ public class MediaFileListFragment extends AbstractListFragment {
                 rootFileLocation.clear();
                 FileLocation fl;
                 for (ItemType.Source item : result) {
-                    if (!item.file.contains(ADDON_SOURCE)) {
+                    if ((item.file != null) &&
+                        (!item.file.contains(ADDON_SOURCE))) {
                         fl = new FileLocation(item.label, item.file, true);
                         fl.setRootDir(true);
                         rootFileLocation.add(fl);
@@ -271,7 +266,8 @@ public class MediaFileListFragment extends AbstractListFragment {
             String path;
             for (FileLocation fl : rootFileLocation) {
                 path = fl.file;
-                if (dir.file.contentEquals(path))    {
+                if ((path != null) && (dir.file != null) &&
+                    (dir.file.contentEquals(path))) {
                     rootPath = fl.file;
                     break;
                 }
@@ -279,7 +275,7 @@ public class MediaFileListFragment extends AbstractListFragment {
             if (rootPath != null) {
                 parentDirectory = rootPath;
                 dir.setRootDir(true);
-            } else {
+            } else if (dir.file != null) {
                 parentDirectory = getParentDirectory(dir.file);
             }
         }
@@ -322,14 +318,14 @@ public class MediaFileListFragment extends AbstractListFragment {
 
         Files.GetDirectory action = new Files.GetDirectory(dir.file,
                 mediaType,
-                new ListType.Sort(ListType.Sort.SORT_METHOD_PATH, true, true),
+                sortMethod,
                 properties);
         action.execute(hostManager.getConnection(), new ApiCallback<List<ListType.ItemFile>>() {
             @Override
             public void onSuccess(List<ListType.ItemFile> result) {
                 if (!isAdded()) return;
 
-                ArrayList<FileLocation> flList = new ArrayList<FileLocation>();
+                ArrayList<FileLocation> flList = new ArrayList<>();
 
                 if (dir.hasParent) {
                     // insert the parent directory as the first item in the list