From 0468894ea1cdaac90891a6bec6a60e558e5a55b6 Mon Sep 17 00:00:00 2001
From: wized2 <wa0026343@gmail.com>
Date: Mon, 21 Sep 2026 08:43:30 +0000
Subject: [PATCH] fix: null-safe getCurrentFragment() in MainActivity

---
 .../fossify/filemanager/activities/MainActivity.kt | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
index 4a6e4be77..c772002c9 100644
--- a/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/org/fossify/filemanager/activities/MainActivity.kt
@@ -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()
     }
 
@@ -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
             }
         }
@@ -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()
             }