[Android] Make favorite sort consistent even after a delete/re-insert

[Nicolas Pomepuy]

vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Apr  9 13:26:18 2020 +0200| [c02fe54e96bd2d4d8e87d45438b17a6c8c3ffc28] | committer: Nicolas Pomepuy

Make favorite sort consistent even after a delete/re-insert

> https://code.videolan.org/videolan/vlc-android/commit/c02fe54e96bd2d4d8e87d45438b17a6c8c3ffc28
---

 .../org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt b/application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
index 8f955417d..e766f965f 100644
--- a/application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
+++ b/application/vlc-android/src/org/videolan/vlc/viewmodels/browser/BrowserFavoritesModel.kt
@@ -27,24 +27,21 @@ package org.videolan.vlc.viewmodels.browser
 import android.app.Application
 import android.content.Context
 import android.net.Uri
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.withContext
 import org.videolan.libvlc.util.MediaBrowser
-import org.videolan.medialibrary.interfaces.media.MediaWrapper
 import org.videolan.medialibrary.media.MediaLibraryItem
-import org.videolan.tools.CoroutineContextProvider
 import org.videolan.tools.livedata.LiveDataset
 import org.videolan.vlc.mediadb.models.BrowserFav
 import org.videolan.vlc.providers.BrowserProvider
 import org.videolan.vlc.repository.BrowserFavRepository
 import org.videolan.vlc.util.convertFavorites
-import kotlin.coroutines.CoroutineContext
 
 class BrowserFavoritesModel(context: Context) : AndroidViewModel(context.applicationContext as Application) {
     val favorites = LiveDataset<MediaLibraryItem>()
@@ -62,7 +59,7 @@ class FavoritesProvider(
         browserFavRepository.browserFavorites
                 .flowOn(Dispatchers.IO)
                 .onEach { list ->
-                    convertFavorites(list.sortedBy { it.type }).let {
+                    convertFavorites(list.sortedWith(compareBy(BrowserFav::title, BrowserFav::type))).let {
                         dataset.value = it as MutableList<MediaLibraryItem>
                         parseSubDirectories()
                     }