mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2025-03-17 19:58:57 +03:00
Move search service into session module.
This commit is contained in:
parent
d599cab017
commit
05f48255a3
17 changed files with 40 additions and 40 deletions
|
@ -15,11 +15,11 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.api.session.room.search
|
||||
package org.matrix.android.sdk.api.session.search
|
||||
|
||||
import org.matrix.android.sdk.api.MatrixCallback
|
||||
import org.matrix.android.sdk.api.util.Cancelable
|
||||
import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.session.search.response.SearchResponse
|
||||
|
||||
/**
|
||||
* This interface defines methods to search messages in rooms.
|
|
@ -39,6 +39,7 @@ import org.matrix.android.sdk.api.session.Session
|
|||
import org.matrix.android.sdk.api.session.accountdata.AccountDataService
|
||||
import org.matrix.android.sdk.api.session.homeserver.HomeServerCapabilitiesService
|
||||
import org.matrix.android.sdk.api.session.permalinks.PermalinkService
|
||||
import org.matrix.android.sdk.api.session.search.SearchService
|
||||
import org.matrix.android.sdk.api.session.securestorage.SecureStorageService
|
||||
import org.matrix.android.sdk.api.session.securestorage.SharedSecretStorageService
|
||||
import org.matrix.android.sdk.api.session.typing.TypingUsersTracker
|
||||
|
@ -81,6 +82,7 @@ import org.matrix.android.sdk.internal.session.permalinks.DefaultPermalinkServic
|
|||
import org.matrix.android.sdk.internal.session.room.EventRelationsAggregationProcessor
|
||||
import org.matrix.android.sdk.internal.session.room.create.RoomCreateEventProcessor
|
||||
import org.matrix.android.sdk.internal.session.room.prune.RedactionEventProcessor
|
||||
import org.matrix.android.sdk.internal.session.search.DefaultSearchService
|
||||
import org.matrix.android.sdk.internal.session.room.tombstone.RoomTombstoneEventProcessor
|
||||
import org.matrix.android.sdk.internal.session.securestorage.DefaultSecureStorageService
|
||||
import org.matrix.android.sdk.internal.session.typing.DefaultTypingUsersTracker
|
||||
|
@ -368,4 +370,7 @@ internal abstract class SessionModule {
|
|||
|
||||
@Binds
|
||||
abstract fun bindTypingUsersTracker(tracker: DefaultTypingUsersTracker): TypingUsersTracker
|
||||
|
||||
@Binds
|
||||
abstract fun bindSearchService(service: DefaultSearchService): SearchService
|
||||
}
|
||||
|
|
|
@ -35,8 +35,8 @@ import org.matrix.android.sdk.internal.session.room.membership.joining.InviteBod
|
|||
import org.matrix.android.sdk.internal.session.room.membership.threepid.ThreePidInviteBody
|
||||
import org.matrix.android.sdk.internal.session.room.relation.RelationsResponse
|
||||
import org.matrix.android.sdk.internal.session.room.reporting.ReportContentBody
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
|
||||
import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
|
||||
import org.matrix.android.sdk.internal.session.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.session.room.send.SendResponse
|
||||
import org.matrix.android.sdk.internal.session.room.tags.TagBody
|
||||
import org.matrix.android.sdk.internal.session.room.timeline.EventContextResponse
|
||||
|
|
|
@ -25,7 +25,6 @@ import org.commonmark.renderer.html.HtmlRenderer
|
|||
import org.matrix.android.sdk.api.session.file.FileService
|
||||
import org.matrix.android.sdk.api.session.room.RoomDirectoryService
|
||||
import org.matrix.android.sdk.api.session.room.RoomService
|
||||
import org.matrix.android.sdk.api.session.room.search.SearchService
|
||||
import org.matrix.android.sdk.internal.session.DefaultFileService
|
||||
import org.matrix.android.sdk.internal.session.SessionScope
|
||||
import org.matrix.android.sdk.internal.session.room.alias.AddRoomAliasTask
|
||||
|
@ -62,9 +61,8 @@ import org.matrix.android.sdk.internal.session.room.relation.FindReactionEventFo
|
|||
import org.matrix.android.sdk.internal.session.room.relation.UpdateQuickReactionTask
|
||||
import org.matrix.android.sdk.internal.session.room.reporting.DefaultReportContentTask
|
||||
import org.matrix.android.sdk.internal.session.room.reporting.ReportContentTask
|
||||
import org.matrix.android.sdk.internal.session.room.search.DefaultSearchService
|
||||
import org.matrix.android.sdk.internal.session.room.search.DefaultSearchTask
|
||||
import org.matrix.android.sdk.internal.session.room.search.SearchTask
|
||||
import org.matrix.android.sdk.internal.session.search.DefaultSearchTask
|
||||
import org.matrix.android.sdk.internal.session.search.SearchTask
|
||||
import org.matrix.android.sdk.internal.session.room.state.DefaultSendStateTask
|
||||
import org.matrix.android.sdk.internal.session.room.state.SendStateTask
|
||||
import org.matrix.android.sdk.internal.session.room.tags.AddTagToRoomTask
|
||||
|
@ -125,9 +123,6 @@ internal abstract class RoomModule {
|
|||
@Binds
|
||||
abstract fun bindFileService(service: DefaultFileService): FileService
|
||||
|
||||
@Binds
|
||||
abstract fun bindSearchService(service: DefaultSearchService): SearchService
|
||||
|
||||
@Binds
|
||||
abstract fun bindCreateRoomTask(task: DefaultCreateRoomTask): CreateRoomTask
|
||||
|
||||
|
|
|
@ -15,12 +15,12 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search
|
||||
package org.matrix.android.sdk.internal.session.search
|
||||
|
||||
import org.matrix.android.sdk.api.MatrixCallback
|
||||
import org.matrix.android.sdk.api.session.room.search.SearchService
|
||||
import org.matrix.android.sdk.api.session.search.SearchService
|
||||
import org.matrix.android.sdk.api.util.Cancelable
|
||||
import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.session.search.response.SearchResponse
|
||||
import javax.inject.Inject
|
||||
import org.matrix.android.sdk.internal.task.TaskExecutor
|
||||
import org.matrix.android.sdk.internal.task.configureWith
|
|
@ -15,18 +15,18 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search
|
||||
package org.matrix.android.sdk.internal.session.search
|
||||
|
||||
import org.greenrobot.eventbus.EventBus
|
||||
import org.matrix.android.sdk.internal.network.executeRequest
|
||||
import org.matrix.android.sdk.internal.session.room.RoomAPI
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestBody
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestCategories
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestEventContext
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestFilter
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestOrder
|
||||
import org.matrix.android.sdk.internal.session.room.search.request.SearchRequestRoomEvents
|
||||
import org.matrix.android.sdk.internal.session.room.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestBody
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestCategories
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestEventContext
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestFilter
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestOrder
|
||||
import org.matrix.android.sdk.internal.session.search.request.SearchRequestRoomEvents
|
||||
import org.matrix.android.sdk.internal.session.search.response.SearchResponse
|
||||
import org.matrix.android.sdk.internal.task.Task
|
||||
import javax.inject.Inject
|
||||
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchRequestBody(
|
||||
internal data class SearchRequestBody(
|
||||
@Json(name = "search_categories")
|
||||
val searchCategories: SearchRequestCategories
|
||||
)
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchRequestCategories(
|
||||
internal data class SearchRequestCategories(
|
||||
// Mapping of category name to search criteria.
|
||||
@Json(name = "room_events")
|
||||
val roomEvents: SearchRequestRoomEvents? = null
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchRequestEventContext(
|
||||
internal data class SearchRequestEventContext(
|
||||
// How many events before the result are returned.
|
||||
@Json(name = "before_limit")
|
||||
val beforeLimit: Int? = null,
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchRequestFilter(
|
||||
internal data class SearchRequestFilter(
|
||||
// The maximum number of events to return.
|
||||
@Json(name = "limit")
|
||||
val limit: Int? = null,
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
|
@ -23,7 +23,7 @@ import com.squareup.moshi.JsonClass
|
|||
* Represents the order in which to search for results.
|
||||
*/
|
||||
@JsonClass(generateAdapter = false)
|
||||
enum class SearchRequestOrder(val value: String) {
|
||||
internal enum class SearchRequestOrder(val value: String) {
|
||||
RANK("rank"),
|
||||
RECENT("recent")
|
||||
}
|
|
@ -15,13 +15,13 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.request
|
||||
package org.matrix.android.sdk.internal.session.search.request
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchRequestRoomEvents(
|
||||
internal data class SearchRequestRoomEvents(
|
||||
// Required. The string to search events for.
|
||||
@Json(name = "search_term")
|
||||
val searchTerm: String,
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.response
|
||||
package org.matrix.android.sdk.internal.session.search.response
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.response
|
||||
package org.matrix.android.sdk.internal.session.search.response
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.response
|
||||
package org.matrix.android.sdk.internal.session.search.response
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
||||
|
@ -23,7 +23,7 @@ import org.matrix.android.sdk.api.session.events.model.Event
|
|||
import org.matrix.android.sdk.api.util.JsonDict
|
||||
|
||||
@JsonClass(generateAdapter = true)
|
||||
data class SearchResponseEventContext(
|
||||
internal data class SearchResponseEventContext(
|
||||
// Events just before the result.
|
||||
@Json(name = "events_before")
|
||||
val eventsBefore: List<Event>,
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.response
|
||||
package org.matrix.android.sdk.internal.session.search.response
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
|
@ -15,7 +15,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.matrix.android.sdk.internal.session.room.search.response
|
||||
package org.matrix.android.sdk.internal.session.search.response
|
||||
|
||||
import com.squareup.moshi.Json
|
||||
import com.squareup.moshi.JsonClass
|
Loading…
Add table
Reference in a new issue