diff --git a/app/build.gradle b/app/build.gradle
index 7bbdbe74c..0dfd9814e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -168,7 +168,7 @@ dependencies {
 
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation "com.vanniktech:emoji-google:0.18.0"
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();
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c0f934fc3..9b032c917 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -161,6 +161,7 @@
          <trusted-key id="A5F483CD733A4EBAEA378B2AE88979FB9B30ACF2">
             <trusting group="androidx.activity"/>
             <trusting group="androidx.annotation"/>
+            <trusting group="androidx.appcompat"/>
             <trusting group="androidx.camera"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
@@ -250,6 +251,11 @@
             <sha256 value="b561e41c1bddb2160f79b9bc7541ad9ed110147ab2ccf63719a23d498470b043" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.activity" name="activity" version="1.7.0">
+         <artifact name="activity-1.7.0.module">
+            <sha256 value="2a746b0126a8ab2f576e7167f1a785b452ef7ee997abd979ee0c5a29c36f6ea6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.activity" name="activity" version="1.9.0">
          <artifact name="activity-1.9.0.aar">
             <sha256 value="46fc8e842d9a4e030dfd9e108c3bc08310f922bd7421f29f67dcaaa4adac3764" origin="Generated by Gradle"/>
@@ -845,6 +851,14 @@
             <sha256 value="a140981a3e65f3cab354652682061d23d19b01e00ee712bc38a5e9b0f69eedcf" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.5.4">
+         <artifact name="fragment-1.5.4.aar">
+            <sha256 value="bc3c2431dda42e94bb9511c587eae890d276e4aafe393a8da7b00169186dafde" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="fragment-1.5.4.module">
+            <sha256 value="af3260808dceb6532efc2d7215be45872c24a699dada7d77bff738ce3b85a7f0" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
          <artifact name="fragment-ktx-1.3.6.aar">
             <sha256 value="3f84a013fdeb8bac92d4ab607aebf39a4ff945f4585a635960ed769cd0255df1" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -979,6 +993,11 @@
             <sha256 value="0027dc887fa3b243c23db40ab0f763fc7efacaafa15df923d233344acfe81a16" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-runtime" version="2.6.1">
+         <artifact name="lifecycle-runtime-2.6.1.module">
+            <sha256 value="a4cbb01a42d07047bd8d870017c96a1b0b7b4673320e86b66317a13be2ec10c7" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-service" version="2.5.1">
          <artifact name="lifecycle-service-2.5.1.module">
             <sha256 value="ae27d4f579cc5d04219bb7e5a1db2da16ea2060ba56176593179832bf96876d9" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -1005,6 +1024,11 @@
             <sha256 value="01e413b73cbe38cb714dc5bdb21bd860931124c8e5f2369803f4aacc49081c9f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.6.1">
+         <artifact name="lifecycle-viewmodel-2.6.1.module">
+            <sha256 value="2b406faea5c12f2b8df4b7a60931f846648f2e1f4d78361e198d1184f19a4797" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.7.0">
          <artifact name="lifecycle-viewmodel-2.7.0.aar">
             <sha256 value="4e1d92e289920cd7b50e3671b9191bd413407349cda6f602b0285464f41c1c82" origin="Generated by Gradle"/>
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index dc23e72dc..307e43429 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 10 errors and 79 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 129 errors and 90 warnings</span>