Apply PR comment

Author: TimoPtr

app/src/main/kotlin/io/homeassistant/companion/android/settings/ConnectionSecurityLevelFragment.kt

@@ -47,12 +47,21 @@ import io.homeassistant.companion.android.onboarding.locationforsecureconnection
  * This fragment is temporary and should be removed once the app fully migrates to Compose Navigation.
  */
 @AndroidEntryPoint
-class ConnectionSecurityLevelFragment : Fragment() {
+class ConnectionSecurityLevelFragment private constructor() : Fragment() {
 
     companion object {
         const val RESULT_KEY = "connection_security_level_result"
-        const val EXTRA_SERVER = "server_id"
-        const val EXTRA_HANDLE_ALL_INSETS = "handle_all_insets"
+        private const val EXTRA_SERVER = "server_id"
+        private const val EXTRA_HANDLE_ALL_INSETS = "handle_all_insets"
+
+        fun newInstance(serverId: Int, handleAllInsets: Boolean = false): ConnectionSecurityLevelFragment {
+            return ConnectionSecurityLevelFragment().apply {
+                arguments = bundleOf(
+                    EXTRA_SERVER to serverId,
+                    EXTRA_HANDLE_ALL_INSETS to handleAllInsets,
+                )
+            }
+        }
     }
 
     private val viewModel: LocationForSecureConnectionViewModel by createViewModelLazy(

app/src/main/kotlin/io/homeassistant/companion/android/settings/server/ServerSettingsFragment.kt

@@ -182,11 +182,7 @@ class ServerSettingsFragment :
         findPreference<Preference>("connection_security_level")?.let {
             it.setOnPreferenceClickListener {
                 parentFragmentManager.commit {
-                    replace(
-                        R.id.content_full_screen,
-                        ConnectionSecurityLevelFragment::class.java,
-                        Bundle().apply { putInt(ConnectionSecurityLevelFragment.EXTRA_SERVER, serverId) },
-                    )
+                    replace(R.id.content_full_screen, ConnectionSecurityLevelFragment.newInstance(serverId))
                     addToBackStack(null)
                 }
                 return@setOnPreferenceClickListener true

app/src/main/kotlin/io/homeassistant/companion/android/webview/WebViewActivity.kt

@@ -1424,14 +1424,8 @@ class WebViewActivity :
             }
         }
 
-        val fragment = ConnectionSecurityLevelFragment().apply {
-            arguments = Bundle().apply {
-                putInt(ConnectionSecurityLevelFragment.EXTRA_SERVER, serverId)
-                putBoolean(ConnectionSecurityLevelFragment.EXTRA_HANDLE_ALL_INSETS, true)
-            }
-        }
         supportFragmentManager.beginTransaction()
-            .replace(android.R.id.content, fragment)
+            .replace(android.R.id.content, ConnectionSecurityLevelFragment.newInstance(serverId, true))
             .addToBackStack(null)
             .commit()
     }