Verified Commit 852c04db authored by Hussein's avatar Hussein

Merge branch 'P4A-1116' into release/v1.1.200

parents 411f4856 5d9c77e3
......@@ -8,6 +8,7 @@ import android.content.Context
import android.os.Build
import androidx.annotation.RequiresApi
import com.fsck.k9.Account
import com.fsck.k9.K9
import com.fsck.k9.Preferences
import java.util.concurrent.Executors
import javax.inject.Inject
......@@ -111,15 +112,15 @@ class NotificationChannelManager @Inject constructor(@Named("AppContext") privat
fun getChannelIdFor(account: Account, channelType: ChannelType): String {
val accountUuid = account.uuid
return if (channelType == ChannelType.MESSAGES) {
"messages_channel_$accountUuid"
} else {
"miscellaneous_channel_$accountUuid"
return when {
channelType == ChannelType.MESSAGES && !K9.isQuietTime() ->
"messages_channel_$accountUuid"
else ->
"miscellaneous_channel_$accountUuid"
}
}
fun displayName(account: Account?): String {
return account?.name + " (" +account?.email +")"
return account?.name + " (" + account?.email + ")"
}
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment