Skip to content
Snippets Groups Projects
Commit 6396c0f4 authored by Robert Stone's avatar Robert Stone Committed by Nicolas Pomepuy
Browse files

Rename function parameters

parent fa864bfd
No related branches found
No related tags found
1 merge request!1380Fix warnings and listener return values
Showing
with 25 additions and 29 deletions
......@@ -296,7 +296,7 @@ class DebugLogService : Service(), Logcat.Callback, Runnable {
}
interface Callback {
fun onStarted(lostList: List<String>)
fun onStarted(logList: List<String>)
fun onStopped()
fun onLog(msg: String)
fun onSaved(success: Boolean, path: String)
......
......@@ -30,8 +30,8 @@ import org.videolan.tools.conflatedActor
* @see org.videolan.vlc.viewmodels.ICallBackHandler
*/
interface IMediaBrowserCallback {
fun registerHistoryCallback(function: () -> Unit)
fun registerMediaCallback(function: () -> Unit)
fun registerHistoryCallback(callback: () -> Unit)
fun registerMediaCallback(callback: () -> Unit)
fun removeCallbacks()
}
......@@ -50,8 +50,8 @@ class MediaBrowserCallback(private val playbackService: PlaybackService) : IMedi
private lateinit var historyActor: SendChannel<Unit>
private lateinit var refreshActor: SendChannel<Unit>
override fun registerHistoryCallback(refresh: () -> Unit) {
historyActor = playbackService.lifecycleScope.conflatedActor { refresh() }
override fun registerHistoryCallback(callback: () -> Unit) {
historyActor = playbackService.lifecycleScope.conflatedActor { callback() }
medialibrary.addHistoryCb(this)
}
......@@ -59,8 +59,8 @@ class MediaBrowserCallback(private val playbackService: PlaybackService) : IMedi
historyActor.trySend(Unit)
}
override fun registerMediaCallback(refresh: () -> Unit) {
refreshActor = playbackService.lifecycleScope.conflatedActor { refresh() }
override fun registerMediaCallback(callback: () -> Unit) {
refreshActor = playbackService.lifecycleScope.conflatedActor { callback() }
medialibrary.addMediaCb(this)
medialibrary.addArtistsCb(this)
medialibrary.addAlbumsCb(this)
......
......@@ -59,7 +59,7 @@ import java.lang.Runnable
class SendCrashActivity : AppCompatActivity(), DebugLogService.Client.Callback {
private var logMessage = ""
override fun onStarted(lostList: List<String>) {
override fun onStarted(logList: List<String>) {
logMessage = "Starting collecting logs at ${System.currentTimeMillis()}"
//initiate a log to wait for
Log.d("SendCrashActivity", logMessage)
......
......@@ -102,11 +102,9 @@ abstract class BaseBrowserFragment : MediaBrowserFragment<BrowserModel>(), IRefr
protected abstract fun createFragment(): Fragment
protected abstract fun browseRoot()
override fun onCreate(bundle: Bundle?) {
@Suppress("NAME_SHADOWING")
var bundle = bundle
super.onCreate(bundle)
if (bundle == null) bundle = arguments
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val bundle = savedInstanceState ?: arguments
if (bundle != null) {
currentMedia = bundle.getParcelable(KEY_MEDIA)
mrl = currentMedia?.location ?: bundle.getString(KEY_MRL)
......
......@@ -45,10 +45,9 @@ class ExtensionBrowser : Fragment(), View.OnClickListener, androidx.swiperefresh
mExtensionManagerService = service
}
override fun onCreate(bundle: Bundle?) {
var bundle = bundle
super.onCreate(bundle)
if (bundle == null) bundle = arguments
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val bundle = savedInstanceState ?: arguments
if (bundle != null) {
mTitle = bundle.getString(KEY_TITLE)
showSettings = bundle.getBoolean(KEY_SHOW_FAB)
......
......@@ -54,7 +54,7 @@ class FilePickerFragment : FileBrowserFragment(), BrowserContainer<MediaLibraryI
return FilePickerFragment()
}
override fun onCreate(bundle: Bundle?) {
override fun onCreate(savedInstanceState: Bundle?) {
requireActivity().intent?.getParcelableExtra<MediaWrapper>(KEY_MEDIA)?.let { media ->
if (media.uri == null || media.uri.scheme == "http" || media.uri.scheme == "content" || media.uri.scheme == "fd") {
activity?.intent = null
......@@ -63,7 +63,7 @@ class FilePickerFragment : FileBrowserFragment(), BrowserContainer<MediaLibraryI
requireActivity().intent?.getIntExtra(KEY_PICKER_TYPE, 0)?.let { pickerIndex ->
pickerType = PickerType.values()[pickerIndex]
} ?: PickerType.SUBTITLE
super.onCreate(bundle)
super.onCreate(savedInstanceState)
adapter = FilePickerAdapter(this)
}
......
......@@ -57,8 +57,8 @@ class NetworkBrowserFragment : BaseBrowserFragment(), IDialogManager {
override val categoryTitle: String
get() = getString(R.string.network_browsing)
override fun onCreate(bundle: Bundle?) {
super.onCreate(bundle)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
dialogsDelegate.observeDialogs(this, this)
networkMonitor = NetworkMonitor.getInstance(requireContext())
(requireActivity() as? SecondaryActivity)?.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_up)
......
......@@ -79,12 +79,11 @@ class StorageBrowserFragment : FileBrowserFragment(), BrowserContainer<MediaLibr
return super.hasFAB()
}
override fun onCreate(bundle: Bundle?) {
var bundle = bundle
super.onCreate(bundle)
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
adapter = StorageBrowserAdapter(this)
(adapter as StorageBrowserAdapter).bannedFolders = Medialibrary.getInstance().bannedFolders().toList()
if (bundle == null) bundle = arguments
val bundle = savedInstanceState ?: arguments
if (bundle != null) scannedDirectory = bundle.getBoolean(KEY_IN_MEDIALIB)
withContext(requireActivity())
withAdapters(arrayOf(adapter as StorageBrowserAdapter))
......
......@@ -94,8 +94,8 @@ class BookmarkAdapter(val bookmarkManager: IBookmarkManager) :
}
interface IBookmarkManager {
fun onPopupMenu(view: View, position: Int, item: Bookmark?)
fun onBookmarkClick(position: Int, item: Bookmark)
fun onPopupMenu(view: View, position: Int, bookmark: Bookmark?)
fun onBookmarkClick(position: Int, bookmark: Bookmark)
}
override fun createCB(): DiffCallback<Bookmark> = object : DiffCallback<Bookmark>() {
......
......@@ -153,8 +153,8 @@ class BookmarkListDelegate(val activity: FragmentActivity, val service: Playback
menu.show()
}
override fun onBookmarkClick(position: Int, item: Bookmark) {
service.setTime(item.time)
override fun onBookmarkClick(position: Int, bookmark: Bookmark) {
service.setTime(bookmark.time)
}
fun setProgressHeight(y: Float) {
......
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