From 4fc976fa7a25ee855e45c02330d94684bb6481a8 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 15 Nov 2025 00:57:34 +0000
Subject: [PATCH 1/4] fix(deps): update dependency
 com.pinterest.ktlint:ktlint-cli to v1.8.0

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 77287e0898..dea7edf3c1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -60,7 +60,7 @@ autoservice = "1.1.1"
 # quality
 detekt = "1.23.8"
 # See https://github.com/pinterest/ktlint/releases/
-ktlint = "1.7.1"
+ktlint = "1.8.0"
 androidx-test-ext-junit = "1.3.0"
 kover = "0.9.1"
 

From ea4dea548a2ddca6a2fbe9228a83f209acffe001 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Nov 2025 13:39:42 +0100
Subject: [PATCH 2/4] Ignore some ktlint rules.

---
 .editorconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 9eaea2e023..d2f28922d9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,7 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false
 
-# Ktlint rule, for more information see https://pinterest.github.io/ktlint/1.1.1/faq/#how-do-i-enable-or-disable-a-rule
+# Ktlint rule, for more information see https://pinterest.github.io/ktlint/latest/faq/#how-do-i-enable-or-disable-a-rule
 ktlint_standard_wrapping = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
 ktlint_standard_trailing-comma-on-declaration-site = disabled
@@ -31,6 +31,10 @@ ktlint_function_naming_ignore_when_annotated_with = Composable
 ktlint_standard_function-expression-body = disabled
 ktlint_standard_chain-method-continuation = disabled
 ktlint_standard_class-signature = disabled
+# Added when upgrading to 1.8.0
+ktlint_standard_when-entry-bracing = disabled
+ktlint_standard_blank-line-between-when-conditions = disabled
+ktlint_standard_mixed-condition-operators = disabled
 
 [*.java]
 ij_java_align_consecutive_assignments = false

From ebbe477135522a6924afd117938fb341f488c192 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Nov 2025 13:40:19 +0100
Subject: [PATCH 3/4] Using Kdoc is not correct here.

---
 .../impl/notifications/channels/NotificationChannels.kt  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
index 36f9d827f5..402d6bcfcd 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
@@ -110,10 +110,7 @@ class DefaultNotificationChannels(
             }
         }
 
-        /**
-         * Default notification importance: shows everywhere, makes noise, but does not visually
-         * intrude.
-         */
+        // Default notification importance: shows everywhere, makes noise, but does not visually intrude.
         notificationManager.createNotificationChannel(
             NotificationChannelCompat.Builder(
                 NOISY_NOTIFICATION_CHANNEL_ID,
@@ -138,9 +135,7 @@ class DefaultNotificationChannels(
                 .build()
         )
 
-        /**
-         * Low notification importance: shows everywhere, but is not intrusive.
-         */
+        // Low notification importance: shows everywhere, but is not intrusive.
         notificationManager.createNotificationChannel(
             NotificationChannelCompat.Builder(
                 SILENT_NOTIFICATION_CHANNEL_ID,

From 49570f53b54500ba1d469d19d57c253debde86c9 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 17 Nov 2025 13:41:16 +0100
Subject: [PATCH 4/4] Cleanup

---
 .../push/impl/notifications/channels/NotificationChannels.kt  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
index 402d6bcfcd..9d1452fdae 100644
--- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
+++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/channels/NotificationChannels.kt
@@ -72,10 +72,6 @@ class DefaultNotificationChannels(
         createNotificationChannels()
     }
 
-    /* ==========================================================================================
-     * Channel names
-     * ========================================================================================== */
-
     /**
      * Create notification channels.
      */