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

Unverified Commit 8c306733 authored by Ashley Soucar's avatar Ashley Soucar Committed by GitHub
Browse files

Merge pull request #9307 from shamim-emon/fix-issue-9306 

Prevent Crash When Adding Gmail Account After Primary Gmail Account Removal
parents 8da31140 585e45ee

legacy/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt

+1 −4
Original line number Diff line number Diff line
@@ -13,16 +13,13 @@ class K9MessageStoreFactory( 
    private val storageFilesProviderFactory: StorageFilesProviderFactory,

    private val basicPartInfoExtractor: BasicPartInfoExtractor,

) : MessageStoreFactory {

    private lateinit var folderNameSanitizer: FolderNameSanitizer



    override fun create(account: LegacyAccount): ListenableMessageStore {

        val localStore = localStoreProvider.getInstance(account)

        if (account.incomingServerSettings.host.isGoogle() ||

            account.outgoingServerSettings.host.isGoogle()

        ) {

            if (!this::folderNameSanitizer.isInitialized) {

                folderNameSanitizer = FolderNameSanitizer(lockableDatabase = localStore.database)

            }

            val folderNameSanitizer = FolderNameSanitizer(lockableDatabase = localStore.database)

            folderNameSanitizer.removeGmailPrefixFromFolders()

        }

        val storageFilesProvider = storageFilesProviderFactory.createStorageFilesProvider(account.uuid)