ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Search Activity with new LabelEntity after rebase. 

MAILAND-1525
This commit is contained in:
Tomasz Giszczak 2021-09-03 22:07:37 +02:00 committed by stefanija
parent ea867aff5b
commit 50ca951dd6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/ch/protonmail/android/activities/SearchActivity.kt
View File

@ -38,16 +38,19 @@ import ch.protonmail.android.api.segments.event.FetchUpdatesJob
import ch.protonmail.android.core.Constants.MessageLocationType
import ch.protonmail.android.core.Constants.MessageLocationType.Companion.fromInt
import ch.protonmail.android.core.ProtonMailApplication
import ch.protonmail.android.data.local.model.Label
import ch.protonmail.android.details.presentation.MessageDetailsActivity
import ch.protonmail.android.events.NoResultsEvent
import ch.protonmail.android.events.SearchResultEvent
import ch.protonmail.android.jobs.SearchMessagesJob
import ch.protonmail.android.labels.data.local.model.LabelEntity
import ch.protonmail.android.mailbox.presentation.MailboxViewModel
import ch.protonmail.android.mailbox.presentation.model.MailboxUiItem
import ch.protonmail.android.utils.AppUtil
import com.squareup.otto.Subscribe
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.runBlocking
import me.proton.core.accountmanager.domain.AccountManager
import javax.inject.Inject
import javax.inject.Provider
@ -66,6 +69,9 @@ internal class SearchActivity : BaseActivity() {
@Inject
lateinit var messageDetailsRepository: MessageDetailsRepository
@Inject
lateinit var accountManager: AccountManager
@Inject
lateinit var mailboxViewModelProvider: Provider<MailboxViewModel>
@ -126,9 +132,12 @@ internal class SearchActivity : BaseActivity() {
startActivity(intent)
}
}
messageDetailsRepository.getAllLabelsLiveData().observe(
val userId = runBlocking {
requireNotNull(accountManager.getPrimaryUserId().first())
}
messageDetailsRepository.getAllLabelsLiveData(userId).observe(
this
) { labels: List<Label>? ->
) { labels: List<LabelEntity>? ->
if (labels != null) {
adapter.setLabels(labels)
}

2
config/detekt/config.yml
View File

@ -2,7 +2,7 @@
# Default excluded files are `` ['**/test/**', '**/**Test/**', '**/gradle/**', '**/buildSrc/**'] ``
build:
maxIssues: 1876
maxIssues: 1892
excludeCorrectable: false
weights:
# complexity: 2