diff --git a/app-feature-preview/src/main/java/app/k9mail/feature/preview/backend/RealOAuth2TokenProvider.kt b/app-feature-preview/src/main/java/app/k9mail/feature/preview/backend/RealOAuth2TokenProvider.kt index eb160dff9..17d300870 100644 --- a/app-feature-preview/src/main/java/app/k9mail/feature/preview/backend/RealOAuth2TokenProvider.kt +++ b/app-feature-preview/src/main/java/app/k9mail/feature/preview/backend/RealOAuth2TokenProvider.kt @@ -38,7 +38,9 @@ class RealOAuth2TokenProvider( val oldAccessToken = authState.accessToken try { - authState.performActionWithFreshTokens(authService) { accessToken: String?, _, authException: AuthorizationException? -> + authState.performActionWithFreshTokens( + authService, + ) { accessToken: String?, _, authException: AuthorizationException? -> token = accessToken exception = authException diff --git a/app/core/src/main/java/com/fsck/k9/helper/PendingIntentCompat.kt b/app/core/src/main/java/com/fsck/k9/helper/PendingIntentCompat.kt index a88d98e5a..b76bbeccd 100644 --- a/app/core/src/main/java/com/fsck/k9/helper/PendingIntentCompat.kt +++ b/app/core/src/main/java/com/fsck/k9/helper/PendingIntentCompat.kt @@ -5,8 +5,8 @@ import android.os.Build object PendingIntentCompat { @JvmField - val FLAG_IMMUTABLE = if (Build.VERSION.SDK_INT >= 23) PendingIntent.FLAG_IMMUTABLE else 0 + val FLAG_IMMUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) PendingIntent.FLAG_IMMUTABLE else 0 @JvmField - val FLAG_MUTABLE = if (Build.VERSION.SDK_INT >= 31) PendingIntent.FLAG_MUTABLE else 0 + val FLAG_MUTABLE = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) PendingIntent.FLAG_MUTABLE else 0 } diff --git a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt index bd818122e..beaa7f1ba 100644 --- a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt +++ b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt @@ -274,7 +274,8 @@ class HtmlSanitizerTest { val result = htmlSanitizer.sanitize(html) - assertThat(result.toCompactString()).isEqualTo("") + assertThat(result.toCompactString()) + .isEqualTo("") } @Test diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt index 373258211..da65f22c7 100644 --- a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt +++ b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt @@ -38,7 +38,9 @@ class RealOAuth2TokenProvider( val oldAccessToken = authState.accessToken try { - authState.performActionWithFreshTokens(authService) { accessToken: String?, _, authException: AuthorizationException? -> + authState.performActionWithFreshTokens( + authService, + ) { accessToken: String?, _, authException: AuthorizationException? -> token = accessToken exception = authException