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

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

Merge pull request #7158 from thundernest/dependency_updates 

Dependency updates
parents a789e3a6 e9535ecd

app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/common/drawer/DrawerCategoryItem.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ fun DrawerCategoryItem( 


@Preview

@Composable

fun DrawerCategoryItemPreview() {

internal fun DrawerCategoryItemPreview() {

    PreviewWithThemes {

        DrawerCategoryItem(

            text = "Text",

app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/common/drawer/DrawerHeaderItem.kt

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ fun DrawerHeaderItem( 


@Preview

@Composable

fun DrawerHeaderItemPreview() {

internal fun DrawerHeaderItemPreview() {

    PreviewWithThemes {

        DrawerHeaderItem(

            text = "Category",

app/core/src/main/java/com/fsck/k9/K9.kt

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ object K9 : EarlyInit { 
    const val MAIL_SERVICE_WAKE_LOCK_TIMEOUT = 60000

    const val BOOT_RECEIVER_WAKE_LOCK_TIMEOUT = 60000



    @Suppress("ktlint:standard:class-naming")

    enum class BACKGROUND_OPS {

        ALWAYS, NEVER, WHEN_CHECKED_AUTO_SYNC

    }

app/core/src/main/java/com/fsck/k9/notification/NotificationIds.kt

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ internal object NotificationIds { 
    }



    private fun getBaseNotificationId(account: Account): Int {

        return 1 /* skip notification ID 0 */ + NUMBER_OF_GENERAL_NOTIFICATIONS +

        /* skip notification ID 0 */

        return 1 + NUMBER_OF_GENERAL_NOTIFICATIONS +

            account.accountNumber * NUMBER_OF_NOTIFICATIONS_PER_ACCOUNT

    }

}

app/core/src/test/java/com/fsck/k9/mailstore/MessageStoreManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class MessageStoreManagerTest { 
        assertThat(messageStoreManager.getMessageStore(account)).isSameAs(messageStore2)

    }



    private fun <T> KStubbing<T>.doNothingOn(block: T.() -> Any) {

    private fun <T : Any> KStubbing<T>.doNothingOn(block: T.() -> Any) {

        doNothing().whenever(mock).block()

    }

}