Browse Source

Fix typo + rewording

merge-requests/1287/head
Nicolas Pomepuy 5 years ago
parent
commit
86ebaccb40
  1. 6
      application/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
  2. 4
      application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
  3. 4
      application/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
  4. 8
      application/vlc-android/src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt
  5. 2
      medialibrary/src/org/videolan/medialibrary/interfaces/Medialibrary.java

6
application/vlc-android/src/org/videolan/vlc/MediaParsingService.kt

@ -232,7 +232,7 @@ class MediaParsingService : LifecycleService(), DevicesDiscoveryCb {
return
}
medialibrary.addDevice(uuid, path, true)
for (folder in Medialibrary.getBlackList())
for (folder in Medialibrary.getBanList())
medialibrary.banFolder(path + folder)
}
}
@ -287,7 +287,7 @@ class MediaParsingService : LifecycleService(), DevicesDiscoveryCb {
}
when {
shouldInit -> {
for (folder in Medialibrary.getBlackList())
for (folder in Medialibrary.getBanList())
medialibrary.banFolder(AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY + folder)
if (preselectedStorages.isEmpty()) {
medialibrary.discover(AndroidDevices.EXTERNAL_PUBLIC_DIRECTORY)
@ -453,7 +453,7 @@ class MediaParsingService : LifecycleService(), DevicesDiscoveryCb {
private suspend fun ActorScope<MLAction>.processAction() {
for (action in channel) when (action) {
is DiscoverStorage -> {
for (folder in Medialibrary.getBlackList()) medialibrary.banFolder(action.path + folder)
for (folder in Medialibrary.getBanList()) medialibrary.banFolder(action.path + folder)
medialibrary.discover(action.path)
}
is DiscoverFolder -> {

4
application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt

@ -87,12 +87,12 @@ class MLStorageBrowserFragment : BaseFragment(), IStorageFragmentDelegate by Sto
override fun onStart() {
super.onStart()
addEntryPointsCallabck()
addEntryPointsCallback()
}
override fun onStop() {
super.onStop()
removeEntryPointsCallabck()
removeEntryPointsCallback()
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {

4
application/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt

@ -105,7 +105,7 @@ class StorageBrowserFragment : FileBrowserFragment(), BrowserContainer<MediaLibr
override fun onStart() {
super.onStart()
addEntryPointsCallabck()
addEntryPointsCallback()
snack?.show()
lifecycleScope.launchWhenStarted { if (isAdded) (adapter as StorageBrowserAdapter).updateListState(requireContext()) }
addBannedFoldersCallback { folder, banned ->
@ -118,7 +118,7 @@ class StorageBrowserFragment : FileBrowserFragment(), BrowserContainer<MediaLibr
override fun onStop() {
super.onStop()
removeEntryPointsCallabck()
removeEntryPointsCallback()
snack?.dismiss()
alertDialog?.let { if (it.isShowing) it.dismiss() }
}

8
application/vlc-android/src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt

@ -39,8 +39,8 @@ import org.videolan.vlc.gui.helpers.ThreeStatesCheckbox
interface IStorageFragmentDelegate {
fun checkBoxAction(v: View, mrl: String)
fun addEntryPointsCallabck()
fun removeEntryPointsCallabck()
fun addEntryPointsCallback()
fun removeEntryPointsCallback()
val processingFolders: SimpleArrayMap<String, CheckBox>
fun withContext(context: Context)
@ -67,11 +67,11 @@ class StorageFragmentDelegate : IStorageFragmentDelegate, EntryPointsEventsCb {
bannedFolderCallback = callback
}
override fun addEntryPointsCallabck() {
override fun addEntryPointsCallback() {
Medialibrary.getInstance().addEntryPointsEventsCb(this)
}
override fun removeEntryPointsCallabck() {
override fun removeEntryPointsCallback() {
Medialibrary.getInstance().removeEntryPointsEventsCb(this)
}

2
medialibrary/src/org/videolan/medialibrary/interfaces/Medialibrary.java

@ -166,7 +166,7 @@ abstract public class Medialibrary {
return mIsInitiated;
}
public static String[] getBlackList() {
public static String[] getBanList() {
return new String[] {
"/Android/data/",
"/Android/media/",

Loading…
Cancel
Save