Skip to content

Commit 23955ac

Browse files
committed
fix #618, properly refresh menu items when appropriate
1 parent 12c2ba7 commit 23955ac

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class MainActivity : SimpleActivity() {
145145
config.temporarilyShowHidden = false
146146
}
147147

148-
private fun refreshMenuItems() {
148+
fun refreshMenuItems() {
149149
val currentFragment = getCurrentFragment() ?: return
150150
val currentViewType = config.getFolderViewType(currentFragment.currentPath)
151151
val favorites = config.favorites

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MimeTypesActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
351351
ChangeViewTypeDialog(this, currentMimeType, true) {
352352
recreateList()
353353
setupLayoutManager()
354+
refreshMenuItems()
354355
}
355356
}
356357

@@ -375,7 +376,7 @@ class MimeTypesActivity : SimpleActivity(), ItemOperationsListener {
375376
}
376377

377378
private fun columnCountChanged() {
378-
invalidateOptionsMenu()
379+
refreshMenuItems()
379380
getRecyclerAdapter()?.apply {
380381
notifyItemRangeChanged(0, listItems.size)
381382
}

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
115115

116116
itemsIgnoringSearch = listItems
117117
activity?.runOnUiThread {
118-
activity?.invalidateOptionsMenu()
118+
(activity as? MainActivity)?.refreshMenuItems()
119119
addItems(listItems, forceRefresh)
120120
if (context != null && currentViewType != context!!.config.getFolderViewType(currentPath)) {
121121
setupLayoutManager()
@@ -492,7 +492,7 @@ class ItemsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
492492
}
493493

494494
private fun columnCountChanged() {
495-
activity?.invalidateOptionsMenu()
495+
(activity as? MainActivity)?.refreshMenuItems()
496496
getRecyclerAdapter()?.apply {
497497
notifyItemRangeChanged(0, listItems.size)
498498
}

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/RecentsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class RecentsFragment(context: Context, attributeSet: AttributeSet) : MyViewPage
188188
}
189189

190190
private fun columnCountChanged() {
191-
activity?.invalidateOptionsMenu()
191+
(activity as? MainActivity)?.refreshMenuItems()
192192
getRecyclerAdapter()?.apply {
193193
notifyItemRangeChanged(0, listItems.size)
194194
}

0 commit comments

Comments
 (0)