cssnr · smashedr · Apr 14, 2026 · Apr 14, 2026 · Apr 14, 2026
diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/FolderFragment.kt
@@ -4,7 +4,6 @@ import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.util.Log
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import androidx.preference.PreferenceManager
@@ -82,10 +81,10 @@ class FolderFragment : DialogFragment() {
             }
             dialog.setPositiveButton("Save") { _, _ ->
                 Log.d("FolderFragment", "selectedName: $selectedName - selectedId: $selectedId")
-                val bundle = bundleOf(
-                    "folderId" to selectedId,
-                    "folderName" to selectedName,
-                )
+                val bundle = Bundle().apply {
+                    putString("folderId", selectedId)
+                    putString("folderName", selectedName)
+                }
                 setFragmentResult("folder_fragment_result", bundle)
                 dismiss()
             }

diff --git a/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt b/app/src/main/java/org/cssnr/zipline/ui/dialogs/UploadOptionsDialog.kt
@@ -9,7 +9,6 @@ import android.widget.EditText
 import android.widget.SeekBar
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.setFragmentResult
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
@@ -103,12 +102,14 @@ class UploadOptionsDialog : DialogFragment() {
                     fileDeletesAt.setText(normalized)
                 }
 
-                val bundle = bundleOf(
-                    "filePassword" to filePassword.text.toString().takeIf { it.isNotEmpty() },
-                    "deletesAt" to fileDeletesAt.text.toString().takeIf { it.isNotEmpty() },
-                    "maxViews" to fileMaxViews.text.toString().toIntOrNull(),
-                    "compression" to imageCompressionBar.progress,
-                )
+                val bundle = Bundle().apply {
+                    putString(
+                        "filePassword",
+                        filePassword.text.toString().takeIf { it.isNotEmpty() })
+                    putString("deletesAt", fileDeletesAt.text.toString().takeIf { it.isNotEmpty() })
+                    fileMaxViews.text.toString().toIntOrNull()?.let { putInt("maxViews", it) }
+                    putInt("compression", imageCompressionBar.progress)
+                }
                 Log.i("UploadOptionsDialog", "bundle: $bundle")
                 setFragmentResult("upload_options_result", bundle)
                 dismiss()

diff --git a/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/setup/SetupFragment.kt
@@ -8,7 +8,6 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import androidx.core.content.edit
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.lifecycleScope
@@ -221,7 +220,7 @@ class SetupFragment : Fragment() {
             }
 
             // Arguments
-            val bundle = bundleOf()
+            val bundle = Bundle()
             when (v.id) {
                 R.id.btn_continue -> {
                     Log.i(LOG_TAG, "Continue Button Pressed. Showing First Run...")

diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/ShortFragment.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.core.net.toUri
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
@@ -107,7 +106,9 @@ class ShortFragment : Fragment() {
 
         binding.optionsButton.setOnClickListener {
             Log.d("optionsButton", "setOnClickListener")
-            navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true))
+            navController.navigate(
+                R.id.nav_item_settings,
+                Bundle().apply { putBoolean("hide_bottom_nav", true) })
         }
 
         binding.openButton.setOnClickListener {
@@ -152,7 +153,7 @@ class ShortFragment : Fragment() {
                         }
                         startActivity(Intent.createChooser(shareIntent, null))
                     }
-                    val bundle = bundleOf("url" to "${savedUrl}/dashboard/urls")
+                    val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/urls") }
                     navController.navigate(
                         R.id.nav_item_home, bundle, NavOptions.Builder()
                             .setPopUpTo(navController.graph.id, true)

diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/TextFragment.kt
@@ -9,7 +9,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
@@ -141,7 +140,9 @@ class TextFragment : Fragment() {
         // Options Button
         binding.optionsButton.setOnClickListener {
             Log.d("optionsButton", "setOnClickListener")
-            navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true))
+            navController.navigate(
+                R.id.nav_item_settings,
+                Bundle().apply { putBoolean("hide_bottom_nav", true) })
         }
 
         // Share Button
@@ -228,7 +229,12 @@ class TextFragment : Fragment() {
                         if (uploadResponse != null) {
                             logFileUpload(true, "Text Upload")
                             this@processUpload.copyToClipboard(uploadResponse.files.first().url)
-                            val bundle = bundleOf("url" to uploadResponse.files.first().url)
+                            val bundle = Bundle().apply {
+                                putString(
+                                    "url",
+                                    uploadResponse.files.first().url
+                                )
+                            }
                             navController.navigate(
                                 R.id.nav_item_home, bundle, NavOptions.Builder()
                                     .setPopUpTo(navController.graph.id, true)

diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadFragment.kt
@@ -23,7 +23,6 @@ import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.ColorUtils
 import androidx.core.net.toUri
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
@@ -268,7 +267,9 @@ class UploadFragment : Fragment() {
         // Options Button
         binding.optionsButton.setOnClickListener {
             Log.d("optionsButton", "setOnClickListener")
-            navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true))
+            navController.navigate(
+                R.id.nav_item_settings,
+                Bundle().apply { putBoolean("hide_bottom_nav", true) })
         }
 
         // Share Button
@@ -384,7 +385,8 @@ class UploadFragment : Fragment() {
                             }
                             startActivity(Intent.createChooser(shareIntent, null))
                         }
-                        val bundle = bundleOf("url" to "${savedUrl}/dashboard/files/")
+                        val bundle =
+                            Bundle().apply { putString("url", "${savedUrl}/dashboard/files/") }
                         navController.navigate(
                             R.id.nav_item_home, bundle, NavOptions.Builder()
                                 .setPopUpTo(navController.graph.id, true)

diff --git a/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/upload/UploadMultiFragment.kt
@@ -13,7 +13,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.setFragmentResultListener
@@ -198,7 +197,9 @@ class UploadMultiFragment : Fragment() {
         // Options Button
         binding.optionsButton.setOnClickListener {
             Log.d("optionsButton", "setOnClickListener")
-            navController.navigate(R.id.nav_item_settings, bundleOf("hide_bottom_nav" to true))
+            navController.navigate(
+                R.id.nav_item_settings,
+                Bundle().apply { putBoolean("hide_bottom_nav", true) })
         }
 
         // Folder Button
@@ -319,7 +320,7 @@ class UploadMultiFragment : Fragment() {
                 }
                 startActivity(Intent.createChooser(shareIntent, null))
             }
-            val bundle = bundleOf("url" to "${savedUrl}/dashboard/files")
+            val bundle = Bundle().apply { putString("url", "${savedUrl}/dashboard/files") }
             navController.navigate(
                 R.id.nav_item_home, bundle, NavOptions.Builder()
                     .setPopUpTo(navController.graph.id, true)

diff --git a/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt b/app/src/main/java/org/cssnr/zipline/ui/user/CropFragment.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup
 import androidx.core.graphics.scale
 import androidx.core.graphics.toColorInt
 import androidx.core.net.toUri
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
 import androidx.navigation.fragment.findNavController
@@ -100,7 +99,9 @@ class CropFragment : Fragment() {
                 FileOutputStream(file).use { out ->
                     val result = cropped.compress(Bitmap.CompressFormat.PNG, 100, out)
                     Log.d(LOG_TAG, "result: $result - file.name: ${file.name}")
-                    setFragmentResult("CropFragment", bundleOf("fileName" to file.name))
+                    setFragmentResult(
+                        "CropFragment",
+                        Bundle().apply { putString("fileName", file.name) })
                     findNavController().navigateUp()
                 }
             } catch (e: Throwable) {