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

Commit 1c5c1e25 authored by Michael Enoma's avatar Michael Enoma
Browse files

Finish update with minor errrors resolution

parent 1a1a2a4e

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

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ object K9 : EarlyInit { 
            }



            val clock = DI.get<Clock>()

            val quietTimeChecker = QuietTimeChecker(clock, quietTimeStarts, quietTimeEnds))

            val quietTimeChecker = QuietTimeChecker(clock, quietTimeStarts, quietTimeEnds)

            return quietTimeChecker.isQuietTime

        }

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

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ import com.fsck.k9.backend.BackendManager 
import com.fsck.k9.backend.api.BackendPusher

import com.fsck.k9.backend.api.BackendPusherCallback

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.mailstore.FolderRepositoryManager

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt

+4 −5
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ package com.fsck.k9.mailstore 


import com.fsck.k9.Account

import com.fsck.k9.Account.FolderMode

import com.fsck.k9.DI

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.controller.SimpleMessagingListener

import com.fsck.k9.helper.sendBlockingSilently

import com.fsck.k9.mail.FolderClass

import com.fsck.k9.preferences.AccountManager

import kotlinx.coroutines.CoroutineDispatcher
@@ -17,16 +21,11 @@ import kotlinx.coroutines.flow.flatMapLatest 
import kotlinx.coroutines.flow.flowOn

import kotlinx.coroutines.flow.map

import com.fsck.k9.mail.FolderType as RemoteFolderType

import com.fsck.k9.DI

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.controller.SimpleMessagingListener

import com.fsck.k9.helper.sendBlockingSilently



@OptIn(ExperimentalCoroutinesApi::class)

class FolderRepository(

    private val messageStoreManager: MessageStoreManager,

    private val accountManager: AccountManager,

    private val account: Account,

    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO

) {

    private val sortForDisplay =

app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ class SettingsExporter( 
            }

        }



        val folderRepository = folderRepositoryManager.getFolderRepository(account)

        writeFolderNameSettings(account, folderRepository, serializer)



        serializer.endTag(null, SETTINGS_ELEMENT)

app/k9mail/src/main/res/values/themes.xml

+0 −2
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@lineageos.platform:@drawable/ic_mark_new</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>
@@ -169,7 +168,6 @@ 
        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@lineageos.platform:drawable/ic_mark_new</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>