diff --git a/app/src/main/java/mega/privacy/android/app/fragments/homepage/documents/DocumentsViewModel.kt b/app/src/main/java/mega/privacy/android/app/fragments/homepage/documents/DocumentsViewModel.kt index 3f15313537..4e4e5c37c1 100644 --- a/app/src/main/java/mega/privacy/android/app/fragments/homepage/documents/DocumentsViewModel.kt +++ b/app/src/main/java/mega/privacy/android/app/fragments/homepage/documents/DocumentsViewModel.kt @@ -13,8 +13,6 @@ 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 @@ -22,6 +20,8 @@ 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 @@ -82,7 +82,7 @@ class DocumentsViewModel @Inject constructor( cancelToken?.let { repository.getFiles( it, - MegaApiJava.FILE_TYPE_DOCUMENT, + MegaApiJava.FILE_TYPE_ALL_DOCS, sortOrder ) } diff --git a/app/src/main/java/mega/privacy/android/app/presentation/search/SearchActivity.kt b/app/src/main/java/mega/privacy/android/app/presentation/search/SearchActivity.kt index 53695bb8b5..10bfb83aeb 100644 --- a/app/src/main/java/mega/privacy/android/app/presentation/search/SearchActivity.kt +++ b/app/src/main/java/mega/privacy/android/app/presentation/search/SearchActivity.kt @@ -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 diff --git a/app/src/main/java/mega/privacy/android/app/presentation/search/SearchFragment.kt b/app/src/main/java/mega/privacy/android/app/presentation/search/SearchFragment.kt index 42c1a65c90..8d0112c74f 100644 --- a/app/src/main/java/mega/privacy/android/app/presentation/search/SearchFragment.kt +++ b/app/src/main/java/mega/privacy/android/app/presentation/search/SearchFragment.kt @@ -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 @@ -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 @@ -1191,7 +1191,7 @@ class SearchFragment : RotatableFragment() { SearchAudioFilterPressedEvent ) - SearchCategory.DOCUMENTS -> Analytics.tracker.trackEvent( + SearchCategory.ALL_DOCUMENTS -> Analytics.tracker.trackEvent( SearchDocsFilterPressedEvent ) diff --git a/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/EmptySearchViewMapper.kt b/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/EmptySearchViewMapper.kt index c49108d314..fba3aaeac0 100644 --- a/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/EmptySearchViewMapper.kt +++ b/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/EmptySearchViewMapper.kt @@ -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 @@ -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) ) diff --git a/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/SearchFilterMapper.kt b/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/SearchFilterMapper.kt index 897bb9e266..b2ac585871 100644 --- a/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/SearchFilterMapper.kt +++ b/app/src/main/java/mega/privacy/android/app/presentation/search/mapper/SearchFilterMapper.kt @@ -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) ) diff --git a/app/src/main/java/mega/privacy/android/app/presentation/search/view/SearchFilterChipsView.kt b/app/src/main/java/mega/privacy/android/app/presentation/search/view/SearchFilterChipsView.kt index bf0c15f7e0..b44771b5e0 100644 --- a/app/src/main/java/mega/privacy/android/app/presentation/search/view/SearchFilterChipsView.kt +++ b/app/src/main/java/mega/privacy/android/app/presentation/search/view/SearchFilterChipsView.kt @@ -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 @@ -101,7 +101,7 @@ internal class SearchStatePreviewsProvider : PreviewParameterProvider 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 } diff --git a/data/src/main/java/mega/privacy/android/data/mapper/search/SearchCategoryMapper.kt b/data/src/main/java/mega/privacy/android/data/mapper/search/SearchCategoryMapper.kt index 272e5458c0..6a27d39959 100644 --- a/data/src/main/java/mega/privacy/android/data/mapper/search/SearchCategoryMapper.kt +++ b/data/src/main/java/mega/privacy/android/data/mapper/search/SearchCategoryMapper.kt @@ -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 } diff --git a/data/src/main/java/mega/privacy/android/data/repository/SearchRepositoryImpl.kt b/data/src/main/java/mega/privacy/android/data/repository/SearchRepositoryImpl.kt index 1b32904fdf..27a64c218b 100644 --- a/data/src/main/java/mega/privacy/android/data/repository/SearchRepositoryImpl.kt +++ b/data/src/main/java/mega/privacy/android/data/repository/SearchRepositoryImpl.kt @@ -36,7 +36,7 @@ internal class SearchRepositoryImpl @Inject constructor( override fun getSearchCategories(): List = 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 { diff --git a/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryIntMapper.kt b/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryIntMapper.kt index 9e4c8542a3..c7fdb2d392 100644 --- a/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryIntMapper.kt +++ b/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryIntMapper.kt @@ -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), ) } \ No newline at end of file diff --git a/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryMapperTest.kt b/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryMapperTest.kt index df6ccd239e..2e8df83412 100644 --- a/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryMapperTest.kt +++ b/data/src/test/java/mega/privacy/android/data/mapper/search/SearchCategoryMapperTest.kt @@ -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), ) } \ No newline at end of file diff --git a/domain/src/main/kotlin/mega/privacy/android/domain/entity/search/SearchCategories.kt b/domain/src/main/kotlin/mega/privacy/android/domain/entity/search/SearchCategories.kt index cc15aec3c9..7f998d77ce 100644 --- a/domain/src/main/kotlin/mega/privacy/android/domain/entity/search/SearchCategories.kt +++ b/domain/src/main/kotlin/mega/privacy/android/domain/entity/search/SearchCategories.kt @@ -24,7 +24,7 @@ enum class SearchCategory { * * shows only documents which is matching the search keyword */ - DOCUMENTS, + ALL_DOCUMENTS, /** * AUDIO diff --git a/domain/src/test/kotlin/mega/privacy/android/domain/usecase/search/GetSearchCategoriesUseCaseTest.kt b/domain/src/test/kotlin/mega/privacy/android/domain/usecase/search/GetSearchCategoriesUseCaseTest.kt index e179862f5e..009b68c73e 100644 --- a/domain/src/test/kotlin/mega/privacy/android/domain/usecase/search/GetSearchCategoriesUseCaseTest.kt +++ b/domain/src/test/kotlin/mega/privacy/android/domain/usecase/search/GetSearchCategoriesUseCaseTest.kt @@ -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() diff --git a/sdk/src/main/jni/mega/sdk b/sdk/src/main/jni/mega/sdk index 076d12cbb1..334ffa4e1f 160000 --- a/sdk/src/main/jni/mega/sdk +++ b/sdk/src/main/jni/mega/sdk @@ -1 +1 @@ -Subproject commit 076d12cbb158f6fe20ba4f610c249bcc54334dea +Subproject commit 334ffa4e1fc3b808d95e04ac89e03efc5d974473