Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 48bf6366 authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #7230 from thundernest/change_detekt_rules 

Change detekt rules
parents 08b981a5 38a2f407

app-feature-preview/src/main/java/app/k9mail/feature/preview/backend/RealOAuth2TokenProvider.kt

+3 −1
Original line number Diff line number Diff line
@@ -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

app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/organism/items/AppBarItems.kt

+1 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ fun TopAppBarItem( 
    TopAppBar(

        title = title,

        subtitle = subtitle,

        navigationIcon = if (navIcon != null) {

        navigationIcon = navIcon?.let {

            {

                IconButton(onClick = {}) {

                    Icon(
@@ -78,8 +78,6 @@ fun TopAppBarItem( 
                    )

                }

            }

        } else {

            null

        },

        actions = {

            IconButton(onClick = {}) {

app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt

+1 −3
Original line number Diff line number Diff line
@@ -57,14 +57,12 @@ internal class DraftOperations( 


        val messageId = messageStore.saveLocalMessage(folderId, message.toSaveMessageData(subject))



        val previousDraftMessage = if (existingDraftId != null) {

        val previousDraftMessage = existingDraftId?.let {

            val localStore = messagingController.getLocalStoreOrThrow(account)

            val localFolder = localStore.getFolder(folderId)

            localFolder.open()



            localFolder.getMessage(existingDraftId)

        } else {

            null

        }



        if (previousDraftMessage != null) {

app/core/src/main/java/com/fsck/k9/helper/PendingIntentCompat.kt

+2 −2
Original line number Diff line number Diff line
@@ -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

}

app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -274,7 +274,8 @@ class HtmlSanitizerTest { 


        val result = htmlSanitizer.sanitize(html)



        assertThat(result.toCompactString()).isEqualTo("<html><head><style>keep this</style></head><body></body></html>")

        assertThat(result.toCompactString())

            .isEqualTo("<html><head><style>keep this</style></head><body></body></html>")

    }



    @Test