From db41174198e9f606a98897d05c5f2c9d28f85626 Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Thu, 11 Jul 2024 10:47:02 +0200 Subject: [PATCH 1/2] Update gradle to 8.7 and plugin gradle to 8.5.0 --- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c96bfa7f72..e01c2cbeed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -androidGradlePlugin = "8.2.2" +androidGradlePlugin = "8.5.0" dotsindicator = "5.0" dragdropswipeRecyclerview = "1.2.0" firebaseMessagingKtx = "23.4.1" # Doesn't build when bumped to 24.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 54971bf126..27dc67cb8a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri Mar 31 08:35:17 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 2e2e09631283743f9d7f7883f5e7d090764cd18b Mon Sep 17 00:00:00 2001 From: Vincent TE Date: Fri, 12 Jul 2024 08:38:50 +0200 Subject: [PATCH 2/2] Fix Lint false positive --- .../main/java/com/infomaniak/mail/utils/NotificationUtils.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/infomaniak/mail/utils/NotificationUtils.kt b/app/src/main/java/com/infomaniak/mail/utils/NotificationUtils.kt index c957448349..472f0b8f9c 100644 --- a/app/src/main/java/com/infomaniak/mail/utils/NotificationUtils.kt +++ b/app/src/main/java/com/infomaniak/mail/utils/NotificationUtils.kt @@ -17,6 +17,7 @@ */ package com.infomaniak.mail.utils +import android.annotation.SuppressLint import android.app.* import android.content.Context import android.content.Intent @@ -161,6 +162,7 @@ class NotificationUtils @Inject constructor( showNotifications(scope, mailboxId, notificationManagerCompat) } + @SuppressLint("WrongConstant") private fun getContentIntent( payload: NotificationPayload, isUndo: Boolean, @@ -240,6 +242,7 @@ class NotificationUtils @Inject constructor( } } + @SuppressLint("WrongConstant") private fun NotificationCompat.Builder.addActions(payload: NotificationPayload) { fun createBroadcastAction(@StringRes title: Int, intent: Intent): NotificationCompat.Action {