Merge pull request #8054 from wmontwe/split-legacy-part-3 (3b6bc6f4) · Commits · e / os / Mail

feature/settings/import/src/main/kotlin/app/k9mail/feature/settings/import/ui/AuthViewModel.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ import androidx.lifecycle.viewModelScope
		import app.k9mail.feature.account.oauth.domain.AccountOAuthDomainContract.UseCase.GetOAuthRequestIntent
		import app.k9mail.feature.account.oauth.domain.entity.AuthorizationIntentResult
		import app.k9mail.legacy.account.Account
		import com.fsck.k9.preferences.AccountManager
		import app.k9mail.legacy.account.AccountManager
		import kotlinx.coroutines.Dispatchers
		import kotlinx.coroutines.flow.MutableStateFlow
		import kotlinx.coroutines.flow.StateFlow

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ import androidx.lifecycle.LifecycleOwner
		import androidx.lifecycle.lifecycleScope
		import androidx.lifecycle.repeatOnLifecycle
		import app.k9mail.feature.settings.importing.R
		import com.fsck.k9.preferences.AccountManager
		import app.k9mail.legacy.account.AccountManager
		import com.fsck.k9.ui.base.K9Activity
		import com.google.android.material.textview.MaterialTextView
		import kotlinx.coroutines.flow.Flow

+7 −2

Original line number	Diff line number	Diff line
		@@ -7,15 +7,17 @@ import android.content.Context
		import android.content.Intent
		import android.widget.RemoteViews
		import androidx.core.app.PendingIntentCompat
		import app.k9mail.legacy.search.SearchAccount.Companion.createUnifiedInboxAccount
		import com.fsck.k9.CoreResourceProvider
		import com.fsck.k9.activity.MessageCompose
		import com.fsck.k9.activity.MessageList
		import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
		import com.fsck.k9.search.SearchAccount.Companion.createUnifiedInboxAccount
		import org.koin.core.component.KoinComponent
		import org.koin.core.component.inject

		abstract class BaseMessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
		private val messageListWidgetManager: MessageListWidgetManager by inject()
		private val coreResourceProvider: CoreResourceProvider by inject()

		override fun onEnabled(context: Context) {
		messageListWidgetManager.onWidgetAdded()
		@@ -61,7 +63,10 @@ abstract class BaseMessageListWidgetProvider : AppWidgetProvider(), KoinComponen
		}

		private fun viewUnifiedInboxPendingIntent(context: Context): PendingIntent {
		val unifiedInboxAccount = createUnifiedInboxAccount()
		val unifiedInboxAccount = createUnifiedInboxAccount(
		unifiedInboxTitle = coreResourceProvider.searchUnifiedInboxTitle(),
		unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),
		)
		val intent = intentDisplaySearch(
		context = context,
		search = unifiedInboxAccount.relatedSearch,

+1 −1

Original line number	Diff line number	Diff line
		package app.k9mail.feature.widget.message.list

		import app.k9mail.legacy.account.Account.SortType
		import com.fsck.k9.search.LocalSearch
		import app.k9mail.legacy.search.LocalSearch

		internal data class MessageListConfig(
		val search: LocalSearch,

+2 −2

Original line number	Diff line number	Diff line
		package app.k9mail.feature.widget.message.list

		import app.k9mail.legacy.account.Account
		import app.k9mail.legacy.mailstore.MessageDetailsAccessor
		import app.k9mail.legacy.mailstore.MessageMapper
		import com.fsck.k9.controller.MessageReference
		import com.fsck.k9.helper.MessageHelper
		import com.fsck.k9.mailstore.MessageDetailsAccessor
		import com.fsck.k9.mailstore.MessageMapper
		import com.fsck.k9.ui.helper.DisplayAddressHelper
		import java.util.Calendar
		import java.util.Locale