From 2eb60213b461ac4b256b78bf8e8d4d05862efb22 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onurays@element.io>
Date: Thu, 17 Sep 2020 12:25:07 +0300
Subject: [PATCH] Do not support searching in multiple rooms for now.

---
 .../matrix/android/sdk/api/session/search/SearchService.kt    | 4 ++--
 .../sdk/internal/session/search/DefaultSearchService.kt       | 4 ++--
 .../matrix/android/sdk/internal/session/search/SearchTask.kt  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
index 9a8b2e49e2..68fc4e5d6f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/search/SearchService.kt
@@ -30,7 +30,7 @@ interface SearchService {
      * Generic function to search a term in multiple rooms.
      * Ref: https://matrix.org/docs/spec/client_server/latest#module-search
      * @param searchTerm the term to search
-     * @param rooms roomIds to search term inside
+     * @param roomId the roomId to search term inside
      * @param nextBatch the token that retrieved from the previous response. Should be provided to get the next batch of results
      * @param limit the maximum number of events to return.
      * @param beforeLimit how many events before the result are returned.
@@ -38,7 +38,7 @@ interface SearchService {
      * @param includeProfile requests that the server returns the historic profile information for the users that sent the events that were returned.
      */
     fun search(searchTerm: String,
-               rooms: List<String>,
+               roomId: String,
                nextBatch: String?,
                orderByRecent: Boolean,
                limit: Int,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
index 1937735191..1f158ec41b 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/DefaultSearchService.kt
@@ -31,7 +31,7 @@ internal class DefaultSearchService @Inject constructor(
 ) : SearchService {
 
     override fun search(searchTerm: String,
-                        rooms: List<String>,
+                        roomId: String,
                         nextBatch: String?,
                         orderByRecent: Boolean,
                         limit: Int,
@@ -42,7 +42,7 @@ internal class DefaultSearchService @Inject constructor(
         return searchTask
                 .configureWith(SearchTask.Params(
                         searchTerm = searchTerm,
-                        rooms = rooms,
+                        roomId = roomId,
                         nextBatch = nextBatch,
                         orderByRecent = orderByRecent,
                         limit = limit,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index 38e87a1251..52b4805e02 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -34,7 +34,7 @@ internal interface SearchTask : Task<SearchTask.Params, SearchResponse> {
 
     data class Params(
             val searchTerm: String,
-            val rooms: List<String>,
+            val roomId: String,
             val nextBatch: String? = null,
             val orderByRecent: Boolean,
             val limit: Int,
@@ -58,7 +58,7 @@ internal class DefaultSearchTask @Inject constructor(
                                     orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
                                     filter = SearchRequestFilter(
                                             limit = params.limit,
-                                            rooms = params.rooms
+                                            rooms = listOf(params.roomId)
                                     ),
                                     eventContext = SearchRequestEventContext(
                                             beforeLimit = params.beforeLimit,