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

Commit 7f26a896 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1472-Update_for_new_account_flow_changes' into 'main' 

1472-Fix UX issue introduced by upstream update

See merge request !154
parents a941839a ef094fc7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -75,5 +75,5 @@ update-default-branch: 
    LOCAL_BRANCH: main

    UPSTREAM_BRANCH: upstream/master

    UPSTREAM_DEFAULT_BRANCH: main

    UPSTREAM_URL: https://github.com/k9mail/k-9.git

    UPSTREAM_URL: https://github.com/thundernest/k-9.git

    TEMP_LATEST_TAG_BRANCH: latest_upstream_tag_branch

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.accounts.Account 
import android.accounts.AccountManager

import android.content.ContentResolver

import android.content.Context

import com.fsck.k9.setup.AccountManagerConstants

import app.k9mail.core.android.common.accountmanager.AccountManagerConstants

import timber.log.Timber



object OsAccountManagerUtil {

app/core/src/main/java/com/fsck/k9/setup/EeloAccountHelper.kt

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



import android.content.Context

import app.k9mail.core.android.common.accountmanager.AccountManagerConstants

import com.fsck.k9.Account

import com.fsck.k9.mail.AuthType

import com.fsck.k9.mail.oauth.AuthStateStorage

app/ui/legacy/src/main/java/com/fsck/k9/account/AccountSyncReceiver.kt

+1 −1
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ import android.content.Context 
import android.content.Intent

import android.os.Build

import androidx.annotation.RequiresApi

import app.k9mail.core.android.common.accountmanager.AccountManagerConstants

import com.fsck.k9.Account

import com.fsck.k9.Preferences

import com.fsck.k9.activity.setup.accountmanager.EeloAccountCreator

import com.fsck.k9.controller.push.PushController

import com.fsck.k9.job.K9JobManager

import com.fsck.k9.setup.AccountManagerConstants

import java.util.concurrent.Executors

import org.koin.core.component.KoinComponent

import org.koin.core.component.inject

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+1 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import androidx.fragment.app.commitNow 
import androidx.lifecycle.lifecycleScope

import app.k9mail.core.android.common.contact.CachingRepository

import app.k9mail.core.android.common.contact.ContactRepository

import app.k9mail.core.android.common.accountmanager.AccountManagerConstants

import app.k9mail.feature.launcher.FeatureLauncherActivity

import com.fsck.k9.Account

import com.fsck.k9.K9
@@ -69,7 +70,6 @@ import com.fsck.k9.search.SearchSpecification 
import com.fsck.k9.search.SearchSpecification.SearchCondition

import com.fsck.k9.search.SearchSpecification.SearchField

import com.fsck.k9.search.isUnifiedInbox

import com.fsck.k9.setup.AccountManagerConstants

import com.fsck.k9.ui.BuildConfig

import com.fsck.k9.ui.K9Drawer

import com.fsck.k9.ui.R