diff --git a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
index fc8411876..aa439c11f 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt
@@ -98,7 +98,7 @@ class CreateConversationDialogFragment : DialogFragment() {
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogCreateConversationBinding.inflate(LayoutInflater.from(context))
+        binding = DialogCreateConversationBinding.inflate(layoutInflater)
 
         val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
             .setTitle(resources.getString(R.string.create_conversation))
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
index fa2c60f5d..71ce7d09b 100644
--- a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
@@ -68,7 +68,7 @@ class RenameConversationDialogFragment : DialogFragment() {
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogRenameConversationBinding.inflate(LayoutInflater.from(context))
+        binding = DialogRenameConversationBinding.inflate(layoutInflater)
 
         val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
             .setTitle(resources.getString(R.string.nc_rename))
diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt
index 7db876580..d2f02d7ba 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollCreateDialogFragment.kt
@@ -57,7 +57,7 @@ class PollCreateDialogFragment : DialogFragment(), PollCreateOptionsItemListener
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogPollCreateBinding.inflate(LayoutInflater.from(context))
+        binding = DialogPollCreateBinding.inflate(layoutInflater)
 
         val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context)
             .setView(binding.root)
diff --git a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt
index 5b7726ef4..5a569c885 100644
--- a/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/polls/ui/PollMainDialogFragment.kt
@@ -61,7 +61,7 @@ class PollMainDialogFragment : DialogFragment() {
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogPollMainBinding.inflate(LayoutInflater.from(context))
+        binding = DialogPollMainBinding.inflate(layoutInflater)
 
         val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root)
 
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
index 3efe7b221..24c7de5e1 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java
@@ -37,12 +37,13 @@ import com.nextcloud.talk.ui.StatusDrawable;
 import com.nextcloud.talk.ui.theme.ViewThemeUtils;
 import com.nextcloud.talk.users.UserManager;
 import com.nextcloud.talk.utils.ApiUtils;
-import com.nextcloud.talk.utils.DisplayUtils;
 import com.nextcloud.talk.utils.CapabilitiesUtil;
+import com.nextcloud.talk.utils.DisplayUtils;
 
 import java.net.CookieManager;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import javax.inject.Inject;
 
@@ -94,7 +95,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        binding = DialogChooseAccountBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = DialogChooseAccountBinding.inflate(getLayoutInflater());
         dialogView = binding.getRoot();
 
         return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create();
@@ -103,7 +104,7 @@ public class ChooseAccountDialogFragment extends DialogFragment {
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
+        Objects.requireNonNull(NextcloudTalkApplication.Companion.getSharedApplication()).getComponentApplication().inject(this);
         User user = userManager.getCurrentUser().blockingGet();
 
         themeViews();
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt
index 4798f20d2..8d71e77d8 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountShareToDialogFragment.kt
@@ -53,7 +53,7 @@ class ChooseAccountShareToDialogFragment : DialogFragment() {
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogChooseAccountShareToBinding.inflate(LayoutInflater.from(requireContext()))
+        binding = DialogChooseAccountShareToBinding.inflate(layoutInflater)
         dialogView = binding!!.root
         return MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create()
     }
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
index 160a3756f..603bc877c 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimePickerFragment.kt
@@ -56,7 +56,7 @@ class DateTimePickerFragment : DialogFragment() {
     lateinit var viewThemeUtils: ViewThemeUtils
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogDateTimePickerBinding.inflate(LayoutInflater.from(context))
+        binding = DialogDateTimePickerBinding.inflate(layoutInflater)
         dialogView = binding.root
         viewModel = (requireActivity() as ChatActivity).chatViewModel
         arguments?.let {
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
index ed006262b..0be7ecb1e 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FileAttachmentPreviewFragment.kt
@@ -45,7 +45,7 @@ class FileAttachmentPreviewFragment : DialogFragment() {
             filesList = it.getStringArrayList(FILES_TO_UPLOAD_ARG)!!
         }
 
-        binding = DialogFileAttachmentPreviewBinding.inflate(LayoutInflater.from(context))
+        binding = DialogFileAttachmentPreviewBinding.inflate(layoutInflater)
         return MaterialAlertDialogBuilder(requireContext()).setView(binding.root).create()
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
index e4cfd93bf..595401fb2 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/FilterConversationFragment.kt
@@ -40,7 +40,7 @@ class FilterConversationFragment : DialogFragment() {
     @Inject
     lateinit var arbitraryStorageManager: ArbitraryStorageManager
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogFilterConversationBinding.inflate(LayoutInflater.from(context))
+        binding = DialogFilterConversationBinding.inflate(layoutInflater)
         dialogView = binding.root
         filterState = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
             arguments?.getSerializable(FILTER_STATE_ARG, HashMap::class.java) as HashMap<String, Boolean>
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
index cad4eff9e..1e8577aba 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
@@ -155,7 +155,7 @@ class SetStatusDialogFragment :
 
     @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        binding = DialogSetStatusBinding.inflate(LayoutInflater.from(context))
+        binding = DialogSetStatusBinding.inflate(layoutInflater)
 
         val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root)
         viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.root.context, dialogBuilder)
diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java
index 96dbf18ba..c23a60a88 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SortingOrderDialogFragment.java
@@ -83,7 +83,7 @@ public class SortingOrderDialogFragment extends DialogFragment implements View.O
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        binding = SortingOrderFragmentBinding.inflate(LayoutInflater.from(requireContext()));
+        binding = SortingOrderFragmentBinding.inflate(getLayoutInflater());
         dialogView = binding.getRoot();
 
         return new MaterialAlertDialogBuilder(requireContext()).setView(dialogView).create();