fix unsafe fragmentid

1 month ago · 6fd622ee05
parent 33224e0dcf
commit 6fd622ee05
6 changed files with 24 additions and 18 deletions
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/advanced/AdvancedSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/advanced/AdvancedSettingsFragment.kt
@ -35,9 +35,10 @@ class AdvancedSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(editor, preferenceXMLRes)
                requireActivity().recreate()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/downloading/DownloadSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/downloading/DownloadSettingsFragment.kt
@ -24,9 +24,10 @@ class DownloadSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(editor, preferenceXMLRes)
                requireActivity().recreate()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/folder/FolderSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/folder/FolderSettingsFragment.kt
@ -48,9 +48,10 @@ class FolderSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(editor, preferenceXMLRes)
                requireActivity().recreate()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/general/GeneralSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/general/GeneralSettingsFragment.kt
@ -29,9 +29,10 @@ class GeneralSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(editor, preferenceXMLRes)
                ThemeUtil.updateThemes()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/processing/ProcessingSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/processing/ProcessingSettingsFragment.kt
@ -29,9 +29,10 @@ class ProcessingSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(editor, preferenceXMLRes)
                requireActivity().recreate()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }
--- a/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/updating/UpdateSettingsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/settings/updating/UpdateSettingsFragment.kt
@ -39,9 +39,10 @@ class UpdateSettingsFragment : BaseSettingsFragment() {
            UiUtil.showGenericConfirmDialog(requireContext(), getString(R.string.reset), getString(R.string.reset_preferences_in_screen)) {
                resetPreferences(preferences.edit(), preferenceXMLRes)
                requireActivity().recreate()
-                val fragmentId = findNavController().currentDestination?.id
-                findNavController().popBackStack(fragmentId!!,true)
-                findNavController().navigate(fragmentId)
+                findNavController().currentDestination?.id?.apply {
+                    findNavController().popBackStack(this,true)
+                    findNavController().navigate(this)
+                }
            }
            true
        }