From 9d7c31d531ecf79146085e4882524eee25dad7d3 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Mar 2021 16:23:27 +0100
Subject: [PATCH] Riot -> Element

---
 .../sdk/api/session/sync/FilterService.kt        |  4 ++--
 .../sdk/internal/session/filter/FilterFactory.kt | 16 ++++++++--------
 .../internal/session/filter/SaveFilterTask.kt    | 12 ++++++------
 .../im/vector/app/core/extensions/Session.kt     |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
index 70de026857..6d1d12f1bc 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/sync/FilterService.kt
@@ -22,9 +22,9 @@ interface FilterService {
         NoFilter,
 
         /**
-         * Filter for Riot, will include only known event type
+         * Filter for Element, will include only known event type
          */
-        RiotFilter
+        ElementFilter
     }
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 2eac0a5059..6b7f884708 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -33,11 +33,11 @@ internal object FilterFactory {
         return FilterUtil.enableLazyLoading(Filter(), true)
     }
 
-    fun createRiotFilter(): Filter {
+    fun createElementFilter(): Filter {
         return Filter(
                 room = RoomFilter(
-                        timeline = createRiotTimelineFilter(),
-                        state = createRiotStateFilter()
+                        timeline = createElementTimelineFilter(),
+                        state = createElementStateFilter()
                 )
         )
     }
@@ -48,7 +48,7 @@ internal object FilterFactory {
         )
     }
 
-    fun createRiotRoomFilter(): RoomEventFilter {
+    fun createElementRoomFilter(): RoomEventFilter {
         return RoomEventFilter(
                 lazyLoadMembers = true
                 // TODO Enable this for optimization
@@ -56,26 +56,26 @@ internal object FilterFactory {
         )
     }
 
-    private fun createRiotTimelineFilter(): RoomEventFilter {
+    private fun createElementTimelineFilter(): RoomEventFilter {
         return RoomEventFilter().apply {
             // TODO Enable this for optimization
             // types = listOfSupportedEventTypes.toMutableList()
         }
     }
 
-    private fun createRiotStateFilter(): RoomEventFilter {
+    private fun createElementStateFilter(): RoomEventFilter {
         return RoomEventFilter(
                 lazyLoadMembers = true
         )
     }
 
-    // Get only managed types by Riot
+    // Get only managed types by Element
     private val listOfSupportedEventTypes = listOf(
             // TODO Complete the list
             EventType.MESSAGE
     )
 
-    // Get only managed types by Riot
+    // Get only managed types by Element
     private val listOfSupportedStateEventTypes = listOf(
             // TODO Complete the list
             EventType.STATE_ROOM_MEMBER
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
index da747934e2..d42962d54a 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/SaveFilterTask.kt
@@ -42,18 +42,18 @@ internal class DefaultSaveFilterTask @Inject constructor(
 
     override suspend fun execute(params: SaveFilterTask.Params) {
         val filterBody = when (params.filterPreset) {
-            FilterService.FilterPreset.RiotFilter -> {
-                FilterFactory.createRiotFilter()
+            FilterService.FilterPreset.ElementFilter -> {
+                FilterFactory.createElementFilter()
             }
-            FilterService.FilterPreset.NoFilter   -> {
+            FilterService.FilterPreset.NoFilter      -> {
                 FilterFactory.createDefaultFilter()
             }
         }
         val roomFilter = when (params.filterPreset) {
-            FilterService.FilterPreset.RiotFilter -> {
-                FilterFactory.createRiotRoomFilter()
+            FilterService.FilterPreset.ElementFilter -> {
+                FilterFactory.createElementRoomFilter()
             }
-            FilterService.FilterPreset.NoFilter   -> {
+            FilterService.FilterPreset.NoFilter      -> {
                 FilterFactory.createDefaultRoomFilter()
             }
         }
diff --git a/vector/src/main/java/im/vector/app/core/extensions/Session.kt b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
index 10dade70ea..a21d4ecab3 100644
--- a/vector/src/main/java/im/vector/app/core/extensions/Session.kt
+++ b/vector/src/main/java/im/vector/app/core/extensions/Session.kt
@@ -29,7 +29,7 @@ import timber.log.Timber
 fun Session.configureAndStart(context: Context) {
     Timber.i("Configure and start session for $myUserId")
     open()
-    setFilter(FilterService.FilterPreset.RiotFilter)
+    setFilter(FilterService.FilterPreset.ElementFilter)
     startSyncing(context)
     refreshPushers()
 }