[Android] Fix typo + rewording

Nicolas Pomepuy git at videolan.org
Thu Feb 24 10:58:19 UTC 2022


vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jan 13 15:16:28 2022 +0100| [86ebaccb406ca0c5eed61a64f3c9bf60744810a6] | committer: Nicolas Pomepuy

Fix typo + rewording

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

 .../vlc-android/src/org/videolan/vlc/MediaParsingService.kt       | 6 +++---
 .../src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt  | 4 ++--
 .../src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt    | 4 ++--
 .../src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt   | 8 ++++----
 .../src/org/videolan/medialibrary/interfaces/Medialibrary.java    | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/vlc-android/src/org/videolan/vlc/MediaParsingService.kt b/application/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
index 95b964403..314808444 100644
--- a/application/vlc-android/src/org/videolan/vlc/MediaParsingService.kt
+++ b/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 -> {
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
index 54d755aa3..d6757167f 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/browser/MLStorageBrowserFragment.kt
+++ b/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? {
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt b/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
index 63256e0e1..8122788c4 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageBrowserFragment.kt
+++ b/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() }
     }
diff --git a/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt b/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt
index abf340579..43b3844a3 100644
--- a/application/vlc-android/src/org/videolan/vlc/gui/browser/StorageFragmentDelegate.kt
+++ b/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)
     }
 
diff --git a/medialibrary/src/org/videolan/medialibrary/interfaces/Medialibrary.java b/medialibrary/src/org/videolan/medialibrary/interfaces/Medialibrary.java
index 0ba96655c..39174677c 100644
--- a/medialibrary/src/org/videolan/medialibrary/interfaces/Medialibrary.java
+++ b/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/",



More information about the Android mailing list