@@ -99,7 +99,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
9999
100100 override fun getIsItemSelectable (position : Int ) = true
101101
102- override fun getItemSelectionKey (position : Int ) = fileDirItems[ position] .path
102+ override fun getItemSelectionKey (position : Int ) = fileDirItems.getOrNull( position)? .path
103103
104104 override fun getItemKeyPosition (key : String ) = fileDirItems.indexOfFirst { it.path == key }
105105
@@ -108,7 +108,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
108108 override fun onBindViewHolder (holder : MyRecyclerViewAdapter .ViewHolder , position : Int ) {
109109 val fileDirItem = fileDirItems[position]
110110 holder.bindView(fileDirItem, true , true ) { itemView, layoutPosition ->
111- setupView(itemView, fileDirItem, isKeySelected(fileDirItem.path) )
111+ setupView(itemView, fileDirItem)
112112 }
113113 bindViewHolder(holder)
114114 }
@@ -149,7 +149,7 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
149149 }
150150
151151 private fun displayRenameDialog () {
152- val oldPath = getSelectedFileDirItems()[ 0 ].path
152+ val oldPath = getFirstSelectedItemPath()
153153 RenameItemDialog (activity, oldPath) {
154154 activity.config.moveFavorite(oldPath, it)
155155 activity.runOnUiThread {
@@ -544,7 +544,8 @@ class ItemsAdapter(activity: SimpleActivity, var fileDirItems: MutableList<FileD
544544 }
545545 }
546546
547- private fun setupView (view : View , fileDirItem : FileDirItem , isSelected : Boolean ) {
547+ private fun setupView (view : View , fileDirItem : FileDirItem ) {
548+ val isSelected = isKeySelected(fileDirItem.path)
548549 view.apply {
549550 item_frame.isSelected = isSelected
550551 val fileName = fileDirItem.name
0 commit comments