Skip to content

Commit

Permalink
T14123137, T14123138 & T14123043 Txt files are not listed in Documents
Browse files Browse the repository at this point in the history
  • Loading branch information
Yenel authored and kh-mega committed Jan 24, 2024
1 parent 45cac48 commit 4730989
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ import kotlinx.coroutines.flow.catch
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.launch
import mega.privacy.android.domain.usecase.node.MonitorNodeUpdatesUseCase
import mega.privacy.android.domain.usecase.offline.MonitorOfflineNodeUpdatesUseCase
import mega.privacy.android.app.fragments.homepage.NodeItem
import mega.privacy.android.app.fragments.homepage.TypedFilesRepository
import mega.privacy.android.app.search.callback.SearchCallback
import mega.privacy.android.app.utils.TextUtil
import mega.privacy.android.domain.entity.SortOrder
import mega.privacy.android.domain.usecase.GetCloudSortOrder
import mega.privacy.android.domain.usecase.network.IsConnectedToInternetUseCase
import mega.privacy.android.domain.usecase.node.MonitorNodeUpdatesUseCase
import mega.privacy.android.domain.usecase.offline.MonitorOfflineNodeUpdatesUseCase
import nz.mega.sdk.MegaApiJava
import nz.mega.sdk.MegaCancelToken
import timber.log.Timber
Expand Down Expand Up @@ -82,7 +82,7 @@ class DocumentsViewModel @Inject constructor(
cancelToken?.let {
repository.getFiles(
it,
MegaApiJava.FILE_TYPE_DOCUMENT,
MegaApiJava.FILE_TYPE_ALL_DOCS,
sortOrder
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class SearchActivity : AppCompatActivity() {
} else {
when (selectedFilter?.filter) {
SearchCategory.IMAGES -> SearchImageFilterPressedEvent
SearchCategory.DOCUMENTS -> SearchDocsFilterPressedEvent
SearchCategory.ALL_DOCUMENTS -> SearchDocsFilterPressedEvent
SearchCategory.AUDIO -> SearchAudioFilterPressedEvent
SearchCategory.VIDEO -> SearchVideosFilterPressedEvent
else -> SearchResetFilterPressedEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ import mega.privacy.android.app.utils.MegaNodeUtil.areAllFileNodesAndNotTakenDow
import mega.privacy.android.app.utils.Util
import mega.privacy.android.app.utils.Util.hideKeyboard
import mega.privacy.android.app.utils.displayMetrics
import mega.privacy.android.shared.theme.MegaAppTheme
import mega.privacy.android.data.qualifier.MegaApi
import mega.privacy.android.domain.entity.ThemeMode
import mega.privacy.android.domain.entity.node.NodeId
Expand All @@ -91,6 +90,7 @@ import mega.privacy.android.domain.entity.search.SearchCategory
import mega.privacy.android.domain.usecase.GetThemeMode
import mega.privacy.android.domain.usecase.featureflag.GetFeatureFlagValueUseCase
import mega.privacy.android.legacy.core.ui.controls.LegacyMegaEmptyViewForSearch
import mega.privacy.android.shared.theme.MegaAppTheme
import mega.privacy.mobile.analytics.event.SearchAudioFilterPressedEvent
import mega.privacy.mobile.analytics.event.SearchDocsFilterPressedEvent
import mega.privacy.mobile.analytics.event.SearchImageFilterPressedEvent
Expand Down Expand Up @@ -1191,7 +1191,7 @@ class SearchFragment : RotatableFragment() {
SearchAudioFilterPressedEvent
)

SearchCategory.DOCUMENTS -> Analytics.tracker.trackEvent(
SearchCategory.ALL_DOCUMENTS -> Analytics.tracker.trackEvent(
SearchDocsFilterPressedEvent
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import android.content.Context
import android.content.res.Configuration
import dagger.hilt.android.qualifiers.ApplicationContext
import mega.privacy.android.app.R
import mega.privacy.android.app.featuretoggle.AppFeatures
import mega.privacy.android.data.qualifier.MegaApi
import mega.privacy.android.domain.entity.search.SearchCategory
import mega.privacy.android.domain.entity.search.SearchCategory.*
import mega.privacy.android.domain.usecase.featureflag.GetFeatureFlagValueUseCase
import mega.privacy.android.domain.entity.search.SearchCategory.ALL_DOCUMENTS
import mega.privacy.android.domain.entity.search.SearchCategory.AUDIO
import mega.privacy.android.domain.entity.search.SearchCategory.IMAGES
import mega.privacy.android.domain.entity.search.SearchCategory.VIDEO
import nz.mega.sdk.MegaApiJava.INVALID_HANDLE
import javax.inject.Inject

Expand Down Expand Up @@ -76,7 +76,7 @@ class EmptySearchViewMapper @Inject constructor(
context.getString(R.string.search_empty_screen_no_images)
)

category == DOCUMENTS -> Pair(
category == ALL_DOCUMENTS -> Pair(
R.drawable.ic_homepage_empty_document,
context.getString(R.string.search_empty_screen_no_documents)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class SearchFilterMapper @Inject constructor(
context.getString(R.string.section_images)
)

SearchCategory.DOCUMENTS -> SearchFilter(
SearchCategory.DOCUMENTS,
SearchCategory.ALL_DOCUMENTS -> SearchFilter(
SearchCategory.ALL_DOCUMENTS,
context.getString(R.string.section_documents)
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import kotlinx.coroutines.launch
import mega.privacy.android.app.R
import mega.privacy.android.app.presentation.search.model.SearchFilter
import mega.privacy.android.app.presentation.search.model.SearchState
import mega.privacy.android.shared.theme.MegaAppTheme
import mega.privacy.android.core.ui.preview.CombinedThemePreviews
import mega.privacy.android.domain.entity.search.SearchCategory
import mega.privacy.android.legacy.core.ui.controls.chips.TextButtonWithIconChipForSearch
import mega.privacy.android.shared.theme.MegaAppTheme

/**
* Search filter chips view
Expand Down Expand Up @@ -101,7 +101,7 @@ internal class SearchStatePreviewsProvider : PreviewParameterProvider<SearchStat
selectedFilter = SearchFilter(SearchCategory.IMAGES, "Images"),
filters = listOf(
SearchFilter(SearchCategory.IMAGES, "Images"),
SearchFilter(SearchCategory.DOCUMENTS, "Docs"),
SearchFilter(SearchCategory.ALL_DOCUMENTS, "Docs"),
SearchFilter(SearchCategory.AUDIO, "Audio"),
SearchFilter(SearchCategory.VIDEO, "Video"),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class EmptySearchViewMapperTest {
fun `test that when search query is null and user has selected documents then No documents message is shown to the user`() {
val actual = underTest(
isSearchChipEnabled = true,
category = SearchCategory.DOCUMENTS
category = SearchCategory.ALL_DOCUMENTS
)
Truth.assertThat(actual.second)
.isEqualTo(context.getString(R.string.search_empty_screen_no_documents))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class SearchFilterMapperTest {

@Test
fun `test that when search category is document all then filter has the name docs`() {
val actual = underTest(SearchCategory.DOCUMENTS)
val actual = underTest(SearchCategory.ALL_DOCUMENTS)
Truth.assertThat(actual.name).isEqualTo(context.getString(R.string.section_documents))
}
}
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ extra["targetSdkVersion"] = 34
extra["buildTools"] = "34.0.0"

// Prebuilt MEGA SDK version
extra["megaSdkVersion"] = "20240110.231623-rel"
extra["megaSdkVersion"] = "20240117.033435-rel"

//JDK and Java Version
extra["jdk"] = "17"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SearchCategoryIntMapper @Inject constructor() {
operator fun invoke(searchCategory: SearchCategory): Int = when (searchCategory) {
SearchCategory.AUDIO -> MegaApiAndroid.FILE_TYPE_AUDIO
SearchCategory.VIDEO -> MegaApiAndroid.FILE_TYPE_VIDEO
SearchCategory.DOCUMENTS -> MegaApiAndroid.FILE_TYPE_DOCUMENT
SearchCategory.ALL_DOCUMENTS -> MegaApiAndroid.FILE_TYPE_ALL_DOCS
SearchCategory.IMAGES -> MegaApiAndroid.FILE_TYPE_PHOTO
else -> MegaApiAndroid.FILE_TYPE_DEFAULT
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ internal class SearchCategoryMapper @Inject constructor() {
operator fun invoke(filter: Int): SearchCategory = when (filter) {
MegaApiAndroid.FILE_TYPE_AUDIO -> SearchCategory.AUDIO
MegaApiAndroid.FILE_TYPE_VIDEO -> SearchCategory.VIDEO
MegaApiAndroid.FILE_TYPE_DOCUMENT -> SearchCategory.DOCUMENTS
MegaApiAndroid.FILE_TYPE_ALL_DOCS -> SearchCategory.ALL_DOCUMENTS
MegaApiAndroid.FILE_TYPE_PHOTO -> SearchCategory.IMAGES
else -> SearchCategory.ALL
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal class SearchRepositoryImpl @Inject constructor(
override fun getSearchCategories(): List<SearchCategory> = listOf(
MegaApiAndroid.FILE_TYPE_DEFAULT,
MegaApiAndroid.FILE_TYPE_PHOTO,
MegaApiAndroid.FILE_TYPE_DOCUMENT,
MegaApiAndroid.FILE_TYPE_ALL_DOCS,
MegaApiAndroid.FILE_TYPE_AUDIO,
MegaApiAndroid.FILE_TYPE_VIDEO,
).map {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SearchCategoryIntMapperTest {
Arguments.of(MegaApiAndroid.FILE_TYPE_DEFAULT, SearchCategory.ALL),
Arguments.of(MegaApiAndroid.FILE_TYPE_AUDIO, SearchCategory.AUDIO),
Arguments.of(MegaApiAndroid.FILE_TYPE_VIDEO, SearchCategory.VIDEO),
Arguments.of(MegaApiAndroid.FILE_TYPE_DOCUMENT, SearchCategory.DOCUMENTS),
Arguments.of(MegaApiAndroid.FILE_TYPE_ALL_DOCS, SearchCategory.ALL_DOCUMENTS),
Arguments.of(MegaApiAndroid.FILE_TYPE_PHOTO, SearchCategory.IMAGES),
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class SearchCategoryMapperTest {
Arguments.of(SearchCategory.ALL, MegaApiAndroid.FILE_TYPE_DEFAULT),
Arguments.of(SearchCategory.AUDIO, MegaApiAndroid.FILE_TYPE_AUDIO),
Arguments.of(SearchCategory.VIDEO, MegaApiAndroid.FILE_TYPE_VIDEO),
Arguments.of(SearchCategory.DOCUMENTS, MegaApiAndroid.FILE_TYPE_DOCUMENT),
Arguments.of(SearchCategory.ALL_DOCUMENTS, MegaApiAndroid.FILE_TYPE_ALL_DOCS),
Arguments.of(SearchCategory.IMAGES, MegaApiAndroid.FILE_TYPE_PHOTO),
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ enum class SearchCategory {
*
* shows only documents which is matching the search keyword
*/
DOCUMENTS,
ALL_DOCUMENTS,

/**
* AUDIO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class GetSearchCategoriesUseCaseTest {
fun `test that GetSearchCategoriesUseCase returns list of search categories`() {
val expected = listOf(
SearchCategory.AUDIO,
SearchCategory.DOCUMENTS
SearchCategory.ALL_DOCUMENTS
)
whenever(searchRepository.getSearchCategories()).thenReturn(expected)
val actual = underTest()
Expand Down

0 comments on commit 4730989

Please sign in to comment.