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

Unverified Commit eb898c9d authored by Wolf-Martell Montwé's avatar Wolf-Martell Montwé Committed by GitHub
Browse files

Merge pull request #8056 from wmontwe/split-legacy-part-4 

Split legacy - part 4
parents 3b6bc6f4 cf75dafa

legacy/ui/legacy/src/main/java/com/fsck/k9/ui/helper/ContextExtensions.kt→core/android/common/src/main/kotlin/app/k9mail/core/android/common/activity/ContextExtensions.kt

+3 −4
Original line number Diff line number Diff line 
@file:JvmName("ContextHelper")



package com.fsck.k9.ui.helper

package app.k9mail.core.android.common.activity



import android.app.Activity

import android.content.Context

import android.content.ContextWrapper



// Source: https://stackoverflow.com/a/58249983

tailrec fun Context.findActivity(): Activity? {

    return this as? Activity ?: (this as? ContextWrapper)?.baseContext?.findActivity()

}
 
tailrec fun Context.findActivity(): Activity? = this as? Activity

    ?: (this as? ContextWrapper)?.baseContext?.findActivity()

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt

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



import com.fsck.k9.controller.MessageReference

import app.k9mail.legacy.message.controller.MessageReference



internal data class MessageListItem(

    val displayName: String,

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 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 app.k9mail.legacy.message.controller.MessageReference

import com.fsck.k9.helper.MessageHelper

import com.fsck.k9.ui.helper.DisplayAddressHelper

import java.util.Calendar

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt

+1 −1
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ package app.k9mail.feature.widget.message.list 


import app.k9mail.legacy.account.Account

import app.k9mail.legacy.account.Account.SortType

import app.k9mail.legacy.mailstore.MessageListRepository

import com.fsck.k9.Preferences

import com.fsck.k9.helper.MessageHelper

import com.fsck.k9.mailstore.MessageColumns

import com.fsck.k9.mailstore.MessageListRepository

import com.fsck.k9.search.SqlQueryBuilder

import com.fsck.k9.search.getAccounts

import timber.log.Timber

feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ import android.appwidget.AppWidgetManager 
import android.content.ComponentName

import android.content.Context

import android.content.Intent

import app.k9mail.legacy.mailstore.MessageListChangedListener

import app.k9mail.legacy.mailstore.MessageListRepository

import com.fsck.k9.core.BuildConfig

import com.fsck.k9.mailstore.MessageListChangedListener

import com.fsck.k9.mailstore.MessageListRepository

import timber.log.Timber



class MessageListWidgetManager(