Skip to content

fix: null-safe getCurrentFragment() in MainActivity #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wized2 wants to merge 1 commit into from
Closed

fix: null-safe getCurrentFragment() in MainActivity #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,24 +471,24 @@ class MainActivity : SimpleActivity() {
}

private fun goHome() {
if (config.homeFolder != getCurrentFragment()!!.currentPath) {
if (config.homeFolder != getCurrentFragment()?.currentPath) {
openPath(config.homeFolder)
}
}

private fun showSortingDialog() {
ChangeSortingDialog(this, getCurrentFragment()!!.currentPath) {
ChangeSortingDialog(this, getCurrentFragment()?.currentPath) {
(getCurrentFragment() as? ItemsFragment)?.refreshFragment()
}
}

private fun addFavorite() {
config.addFavorite(getCurrentFragment()!!.currentPath)
config.addFavorite(getCurrentFragment()?.currentPath)
refreshMenuItems()
}

private fun removeFavorite() {
config.removeFavorite(getCurrentFragment()!!.currentPath)
config.removeFavorite(getCurrentFragment()?.currentPath)
refreshMenuItems()
}

Expand Down Expand Up @@ -531,7 +531,7 @@ class MainActivity : SimpleActivity() {
favorites.forEachIndexed { index, path ->
val visiblePath = humanizePath(path).replace("/", " / ")
items.add(RadioItem(index, visiblePath, path))
if (path == getCurrentFragment()!!.currentPath) {
if (path == getCurrentFragment()?.currentPath) {
currFavoriteIndex = index
}
}
Expand All @@ -542,12 +542,12 @@ class MainActivity : SimpleActivity() {
}

private fun setAsHome() {
config.homeFolder = getCurrentFragment()!!.currentPath
config.homeFolder = getCurrentFragment()?.currentPath
toast(R.string.home_folder_updated)
}

private fun changeViewType() {
ChangeViewTypeDialog(this, getCurrentFragment()!!.currentPath, getCurrentFragment() is ItemsFragment) {
ChangeViewTypeDialog(this, getCurrentFragment()?.currentPath, getCurrentFragment() is ItemsFragment) {
getAllFragments().forEach {
it?.refreshFragment()
}
Expand Down
Loading