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

Unverified Commit 99b329ad authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé
Browse files

Add `:legacy:notification` module and move notification light, settings and vibration there

parent d112632e

legacy/core/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ dependencies { 
    api(projects.core.android.common)



    api(projects.legacy.account)

    api(projects.legacy.notification)



    implementation(projects.plugins.openpgpApiLib.openpgpApi)

legacy/core/src/main/java/com/fsck/k9/Account.kt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.fsck.k9 


import app.k9mail.legacy.account.BaseAccount

import app.k9mail.legacy.account.Identity

import app.k9mail.legacy.notification.NotificationSettings

import com.fsck.k9.backend.api.SyncConfig.ExpungePolicy

import com.fsck.k9.mail.Address

import com.fsck.k9.mail.ServerSettings

legacy/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt

+4 −0
Original line number Diff line number Diff line 
package com.fsck.k9



import app.k9mail.legacy.account.Identity

import app.k9mail.legacy.notification.NotificationLight

import app.k9mail.legacy.notification.NotificationSettings

import app.k9mail.legacy.notification.NotificationVibration

import app.k9mail.legacy.notification.VibratePattern

import com.fsck.k9.Account.Companion.DEFAULT_SORT_ASCENDING

import com.fsck.k9.Account.Companion.DEFAULT_SORT_TYPE

import com.fsck.k9.Account.Companion.DEFAULT_SYNC_INTERVAL

legacy/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ internal class BaseNotificationDataCreator { 
    private fun createNotificationAppearance(account: Account): NotificationAppearance {

        return with(account.notificationSettings) {

            val vibrationPattern = vibration.systemPattern.takeIf { vibration.isEnabled }

            NotificationAppearance(ringtone, vibrationPattern, account.notificationSettings.light.toColor(account))

            NotificationAppearance(

                ringtone = ringtone,

                vibrationPattern = vibrationPattern,

                ledColor = account.notificationSettings.light.toColor(account.chipColor),

            )

        }

    }

}

legacy/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ import android.net.Uri 
import android.os.Build

import androidx.annotation.RequiresApi

import androidx.core.net.toUri

import app.k9mail.legacy.notification.NotificationLight

import app.k9mail.legacy.notification.NotificationSettings

import com.fsck.k9.Account

import com.fsck.k9.NotificationLight

import com.fsck.k9.NotificationSettings

import com.fsck.k9.preferences.AccountManager

import java.util.concurrent.Executor

import timber.log.Timber
@@ -244,7 +244,7 @@ class NotificationChannelManager( 
            setSound(notificationSettings.ringtone?.toUri(), Notification.AUDIO_ATTRIBUTES_DEFAULT)

        }



        notificationSettings.light.toColor(account)?.let { lightColor ->

        notificationSettings.light.toColor(account.chipColor)?.let { lightColor ->

            this.lightColor = lightColor

        }

        val isLightEnabled = notificationSettings.light != NotificationLight.Disabled