fix: use bundle to pass torrent name instead of constructor arg

Yash-Garg · Oct 13, 2022 · b50d509 · b50d509
1 parent 5c53e71
commit b50d509
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/dialogs/RenameTorrentDialog.kt
@@ -11,7 +11,7 @@ import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import dev.yashgarg.qbit.R
 
-class RenameTorrentDialog(private val title: String) : DialogFragment() {
+class RenameTorrentDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         super.onCreateDialog(savedInstanceState)
         val alertDialogBuilder = MaterialAlertDialogBuilder(requireContext())
@@ -24,14 +24,15 @@ class RenameTorrentDialog(private val title: String) : DialogFragment() {
             setPositiveButton("Rename", null)
         }
 
+        val title = arguments?.getString(TORRENT_NAME_KEY)
         val dialog = alertDialogBuilder.create()
         dialog.window?.setSoftInputMode(5)
 
         dialog.setOnShowListener {
             val nameTil = dialog.findViewById<TextInputLayout>(R.id.torrentName_til)
             val nameTiet = dialog.findViewById<TextInputEditText>(R.id.torrentName_tiet)
             nameTiet?.setText(title)
-            nameTiet?.setSelection(title.length)
+            nameTiet?.setSelection(title?.length ?: 0)
 
             dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                 if (!nameTiet?.text.isNullOrEmpty()) {
@@ -50,8 +51,9 @@ class RenameTorrentDialog(private val title: String) : DialogFragment() {
     }
 
     companion object {
-        fun newInstance(title: String): RenameTorrentDialog = RenameTorrentDialog(title)
+        fun newInstance(): RenameTorrentDialog = RenameTorrentDialog()
         const val TAG = "RenameTorrentDialogFragment"
+        const val TORRENT_NAME_KEY = "torrent_name"
         const val RENAME_TORRENT_KEY = "rename_torrent"
         const val RENAME_KEY = "rename_fragment"
     }

diff --git a/app/src/main/kotlin/dev/yashgarg/qbit/ui/torrent/TorrentDetailsFragment.kt b/app/src/main/kotlin/dev/yashgarg/qbit/ui/torrent/TorrentDetailsFragment.kt
@@ -3,6 +3,7 @@ package dev.yashgarg.qbit.ui.torrent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
+import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.flowWithLifecycle
@@ -118,8 +119,10 @@ class TorrentDetailsFragment : Fragment(R.layout.torrent_details_fragment) {
                 add("Rename")
                     .setIcon(R.drawable.twotone_drive_file_rename_outline_24)
                     .setOnMenuItemClickListener {
-                        RenameTorrentDialog.newInstance(torrent.name)
-                            .show(childFragmentManager, RenameTorrentDialog.TAG)
+                        val dialog = RenameTorrentDialog.newInstance()
+                        dialog.arguments =
+                            bundleOf(RenameTorrentDialog.TORRENT_NAME_KEY to torrent.name)
+                        dialog.show(childFragmentManager, RenameTorrentDialog.TAG)
                         true
                     }
             }