diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchForegroundService.kt b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchForegroundService.kt
index 90b22c9ebe2..37ce5afd1d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchForegroundService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchForegroundService.kt
@@ -149,7 +149,7 @@ class FcmFetchForegroundService : Service() {
         .setSmallIcon(R.drawable.ic_signal_refresh)
         .setContentTitle(getString(R.string.BackgroundMessageRetriever_checking_for_messages))
         .setCategory(NotificationCompat.CATEGORY_SERVICE)
-        .setProgress(0, 0, true)
+        .setStyle(NotificationCompat.ProgressStyle().setProgress(0).setProgressIndeterminate(true))
         .setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), PendingIntentFlags.mutable()))
         .setVibrate(longArrayOf(0))
         .build()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
index b131d125e19..3f5fecbc870 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/AttachmentProgressService.kt
@@ -123,7 +123,11 @@ class AttachmentProgressService : SafeForegroundService() {
     return NotificationCompat.Builder(this, NotificationChannels.getInstance().OTHER)
       .setSmallIcon(R.drawable.ic_notification)
       .setContentTitle(title)
-      .setProgress(100, (progress * 100).toInt(), indeterminate)
+      .setStyle(
+        NotificationCompat.ProgressStyle()
+          .setProgress((progress * 100).toInt())
+          .setProgressIndeterminate(indeterminate)
+      )
       .setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), PendingIntentFlags.mutable()))
       .setVibrate(longArrayOf(0))
       .build()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt
index 54ca719bcae..954162f1ecf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.service
 
 import android.app.ForegroundServiceStartNotAllowedException
+import android.app.Notification
 import android.app.PendingIntent
 import android.app.Service
 import android.content.Context
@@ -231,12 +232,17 @@ class GenericForegroundService : Service() {
     lastPosted = active
 
     try {
+      val progressMax = Notification.ProgressStyle.Segment(active.progressMax)
       startForeground(
         NOTIFICATION_ID,
         NotificationCompat.Builder(this, active.channelId)
           .setSmallIcon(active.iconRes)
           .setContentTitle(active.title)
-          .setProgress(active.progressMax, active.progress, active.indeterminate)
+          .setStyle(
+            NotificationCompat.ProgressStyle().setProgress(active.progress)
+              .setProgressIndeterminate(active.indeterminate)
+              .setProgressSegments(listOf(progressMax))
+          )
           .setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), mutable()))
           .setVibrate(longArrayOf(0))
           .build()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 99a018f774b..eeb913ce79a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # SDK & Build Versions
-buildTools = "35.0.0"
+buildTools = "36.1.0-rc1"
 compileSdk = "android-36"
 targetSdk = "35"
 minSdk = "23"
@@ -88,7 +88,7 @@ ktlint-twitter-compose = "com.twitter.compose.rules:ktlint:0.0.26"
 # Android X
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
-androidx-core-ktx = "androidx.core:core-ktx:1.15.0"
+androidx-core-ktx = "androidx.core:core-ktx:1.17.0"
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "androidx-fragment" }
 androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "androidx-fragment" }
 androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "androidx-fragment" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index b17b032cad6..a03848304fe 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3872,6 +3872,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="4ab4a3b0bc1664e3a2c60dec699af635778e15c6ee373971690948f073dd721e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core" version="1.17.0">
+         <artifact name="core-1.17.0.aar">
+            <sha256 value="e1bd22bbcf5cee3a992dedb7d2d3c3b31c9f761c01e56d00ea443c8aaa981182" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-1.17.0.module">
+            <sha256 value="6006fde98c6fa98a9180b940bb44971aa5c9243e39f947ad6caddf386fc9cfea" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core" version="1.2.0">
          <artifact name="core-1.2.0.aar">
             <md5 value="0ac84e1b33940d04c38f4a65220168b2" origin="Generated by Gradle"/>
@@ -3952,6 +3960,14 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="89fb92ca127594cdcd11c5efb5ab0e8eb23466bc41b8df7579514d2fef6e1281" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.core" name="core-ktx" version="1.17.0">
+         <artifact name="core-ktx-1.17.0.aar">
+            <sha256 value="4d23190b8623b8abb3c5247a0a7727eca347062d026335c427a09e82711b15f8" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="core-ktx-1.17.0.module">
+            <sha256 value="ed7bcadc39c62d00daee44f4a78a23ca83fbc399f22fa90ace4e859b415c9048" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.core" name="core-ktx" version="1.2.0">
          <artifact name="core-ktx-1.2.0.aar">
             <sha256 value="dcb74d510d552b35eff73b0dd27b829649535f3902e5b5a1f26040383c10a940" origin="Generated by Gradle"/>