1 files changed, 8 insertions, 8 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt b/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt
index 55a767d8..94379bbf 100644
--- a/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt
+++ b/app/src/main/java/com/zeapo/pwdstore/ui/dialogs/ItemCreationBottomSheet.kt
@@ -11,11 +11,15 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.widget.FrameLayout
-import androidx.fragment.app.Fragment
+import androidx.core.os.bundleOf
+import androidx.fragment.app.setFragmentResult
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.zeapo.pwdstore.PasswordFragment
+import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_FOLDER
+import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_KEY
+import com.zeapo.pwdstore.PasswordFragment.Companion.ACTION_PASSWORD
+import com.zeapo.pwdstore.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY
 import com.zeapo.pwdstore.R
 import com.zeapo.pwdstore.utils.resolveAttribute
 
@@ -50,11 +54,11 @@ class ItemCreationBottomSheet : BottomSheetDialogFragment() {
                     addBottomSheetCallback(bottomSheetCallback)
                 }
                 dialog.findViewById<View>(R.id.create_folder)?.setOnClickListener {
-                    (requireTargetFragment() as PasswordFragment).createFolder()
+                    setFragmentResult(ITEM_CREATION_REQUEST_KEY, bundleOf(ACTION_KEY to ACTION_FOLDER))
                     dismiss()
                 }
                 dialog.findViewById<View>(R.id.create_password)?.setOnClickListener {
-                    (requireTargetFragment() as PasswordFragment).createPassword()
+                    setFragmentResult(ITEM_CREATION_REQUEST_KEY, bundleOf(ACTION_KEY to ACTION_PASSWORD))
                     dismiss()
                 }
             }
@@ -69,8 +73,4 @@ class ItemCreationBottomSheet : BottomSheetDialogFragment() {
         super.dismiss()
         behavior?.removeBottomSheetCallback(bottomSheetCallback)
     }
-
-    private fun requireTargetFragment(): Fragment = requireNotNull(targetFragment) {
-        "A target fragment must be set for $this"
-    }
 }