jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Riot -> Element

This commit is contained in:
Benoit Marty 2021-03-04 16:23:27 +01:00 committed by Benoit Marty
parent 79c9c7105e
commit 9d7c31d531
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
View File

@ -22,9 +22,9 @@ interface FilterService {
NoFilter, NoFilter,
/** /**
* Filter for Riot, will include only known event type * Filter for Element, will include only known event type
*/ */
RiotFilter ElementFilter
} }
/** /**

16
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
View File

@ -33,11 +33,11 @@ internal object FilterFactory {
return FilterUtil.enableLazyLoading(Filter(), true) return FilterUtil.enableLazyLoading(Filter(), true)
} }
fun createRiotFilter(): Filter { fun createElementFilter(): Filter {
return Filter( return Filter(
room = RoomFilter( room = RoomFilter(
timeline = createRiotTimelineFilter(), timeline = createElementTimelineFilter(),
state = createRiotStateFilter() state = createElementStateFilter()
) )
) )
} }
@ -48,7 +48,7 @@ internal object FilterFactory {
) )
} }
fun createRiotRoomFilter(): RoomEventFilter { fun createElementRoomFilter(): RoomEventFilter {
return RoomEventFilter( return RoomEventFilter(
lazyLoadMembers = true lazyLoadMembers = true
// TODO Enable this for optimization // TODO Enable this for optimization
@ -56,26 +56,26 @@ internal object FilterFactory {
) )
} }
private fun createRiotTimelineFilter(): RoomEventFilter { private fun createElementTimelineFilter(): RoomEventFilter {
return RoomEventFilter().apply { return RoomEventFilter().apply {
// TODO Enable this for optimization // TODO Enable this for optimization
// types = listOfSupportedEventTypes.toMutableList() // types = listOfSupportedEventTypes.toMutableList()
} }
} }
private fun createRiotStateFilter(): RoomEventFilter { private fun createElementStateFilter(): RoomEventFilter {
return RoomEventFilter( return RoomEventFilter(
lazyLoadMembers = true lazyLoadMembers = true
) )
} }
// Get only managed types by Riot // Get only managed types by Element
private val listOfSupportedEventTypes = listOf( private val listOfSupportedEventTypes = listOf(
// TODO Complete the list // TODO Complete the list
EventType.MESSAGE EventType.MESSAGE
) )
// Get only managed types by Riot // Get only managed types by Element
private val listOfSupportedStateEventTypes = listOf( private val listOfSupportedStateEventTypes = listOf(
// TODO Complete the list // TODO Complete the list
EventType.STATE_ROOM_MEMBER EventType.STATE_ROOM_MEMBER

12
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
View File

@ -42,18 +42,18 @@ internal class DefaultSaveFilterTask @Inject constructor(
override suspend fun execute(params: SaveFilterTask.Params) { override suspend fun execute(params: SaveFilterTask.Params) {
val filterBody = when (params.filterPreset) { val filterBody = when (params.filterPreset) {
FilterService.FilterPreset.RiotFilter -> { FilterService.FilterPreset.ElementFilter -> {
FilterFactory.createRiotFilter() FilterFactory.createElementFilter()
} }
FilterService.FilterPreset.NoFilter -> { FilterService.FilterPreset.NoFilter -> {
FilterFactory.createDefaultFilter() FilterFactory.createDefaultFilter()
} }
} }
val roomFilter = when (params.filterPreset) { val roomFilter = when (params.filterPreset) {
FilterService.FilterPreset.RiotFilter -> { FilterService.FilterPreset.ElementFilter -> {
FilterFactory.createRiotRoomFilter() FilterFactory.createElementRoomFilter()
} }
FilterService.FilterPreset.NoFilter -> { FilterService.FilterPreset.NoFilter -> {
FilterFactory.createDefaultRoomFilter() FilterFactory.createDefaultRoomFilter()
} }
} }

2
vector/src/main/java/im/vector/app/core/extensions/Session.kt
View File

@ -29,7 +29,7 @@ import timber.log.Timber
fun Session.configureAndStart(context: Context) { fun Session.configureAndStart(context: Context) {
Timber.i("Configure and start session for $myUserId") Timber.i("Configure and start session for $myUserId")
open() open()
setFilter(FilterService.FilterPreset.RiotFilter) setFilter(FilterService.FilterPreset.ElementFilter)
startSyncing(context) startSyncing(context)
refreshPushers() refreshPushers()
} }