Skip to content
Snippets Groups Projects
Commit a7de371a authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Cancel current job before updating favorites

parent 06fa41fb
No related branches found
No related tags found
No related merge requests found
......@@ -57,7 +57,7 @@ abstract class BrowserProvider(val dataset: LiveDataset<MediaLibraryItem>, val u
private val foldersContentMap = SimpleArrayMap<MediaLibraryItem, MutableList<MediaLibraryItem>>()
private lateinit var browserChannel : Channel<Media>
private var job : Job? = null
protected var job : Job? = null
val descriptionUpdate = MutableLiveData<Pair<Int, String>>()
internal val medialibrary = Medialibrary.getInstance()
......
......@@ -25,6 +25,7 @@ import android.hardware.usb.UsbDevice
import android.net.Uri
import android.text.TextUtils
import kotlinx.coroutines.experimental.Job
import kotlinx.coroutines.experimental.cancelAndJoin
import kotlinx.coroutines.experimental.withContext
import org.videolan.libvlc.util.AndroidUtil
import org.videolan.medialibrary.media.DummyItem
......@@ -62,13 +63,16 @@ open class FileBrowserProvider(
}
}
}
if (favs.isNotEmpty()) {
val quickAccess = VLCApplication.getAppResources().getString(R.string.browser_quick_access)
data.add(DummyItem(quickAccess))
for (fav in favs) if (File(fav.uri.path).exists()) data.add(fav)
uiJob(false) {
if (favs.isNotEmpty()) {
job?.cancelAndJoin()
val quickAccess = VLCApplication.getAppResources().getString(R.string.browser_quick_access)
data.add(DummyItem(quickAccess))
for (fav in favs) if (File(fav.uri.path).exists()) data.add(fav)
}
dataset.value = data
parseSubDirectories()
}
dataset.value = data
uiJob(false) { parseSubDirectories() }
} }
init {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment