From ae4ae4111dc22bcabb0e7d036291c898e1b3c4eb Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Mon, 26 Apr 2021 10:55:25 +0200
Subject: [PATCH] Restore rx methods, may be used by forks...

---
 .../src/main/java/org/matrix/android/sdk/rx/RxRoom.kt | 11 +++++++++++
 .../main/java/org/matrix/android/sdk/rx/RxSession.kt  | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
index 3f61ca0103..21db4e1893 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxRoom.kt
@@ -19,7 +19,9 @@ package org.matrix.android.sdk.rx
 import android.net.Uri
 import io.reactivex.Completable
 import io.reactivex.Observable
+import io.reactivex.Single
 import kotlinx.coroutines.rx2.rxCompletable
+import kotlinx.coroutines.rx2.rxSingle
 import org.matrix.android.sdk.api.query.QueryStringValue
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.identity.ThreePid
@@ -89,6 +91,15 @@ class RxRoom(private val room: Room) {
         return room.getMyReadReceiptLive().asObservable()
     }
 
+    fun loadRoomMembersIfNeeded(): Single<Unit> = rxSingle {
+        room.loadRoomMembersIfNeeded()
+    }
+
+    fun joinRoom(reason: String? = null,
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        room.join(reason, viaServers)
+    }
+
     fun liveEventReadReceipts(eventId: String): Observable<List<ReadReceipt>> {
         return room.getEventReadReceiptsLive(eventId).asObservable()
     }
diff --git a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
index 5d8b019284..0fe2b01576 100644
--- a/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
+++ b/matrix-sdk-android-rx/src/main/java/org/matrix/android/sdk/rx/RxSession.kt
@@ -38,6 +38,7 @@ import org.matrix.android.sdk.api.session.room.RoomSummaryQueryParams
 import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
 import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
 import org.matrix.android.sdk.api.session.room.model.RoomSummary
+import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.sync.SyncState
 import org.matrix.android.sdk.api.session.user.model.User
 import org.matrix.android.sdk.api.session.widgets.model.Widget
@@ -123,12 +124,22 @@ class RxSession(private val session: Session) {
                 .startWithCallable { session.getPendingThreePids() }
     }
 
+    fun createRoom(roomParams: CreateRoomParams): Single<String> = rxSingle {
+        session.createRoom(roomParams)
+    }
+
     fun searchUsersDirectory(search: String,
                              limit: Int,
                              excludedUserIds: Set<String>): Single<List<User>> = rxSingle {
         session.searchUsersDirectory(search, limit, excludedUserIds)
     }
 
+    fun joinRoom(roomIdOrAlias: String,
+                 reason: String? = null,
+                 viaServers: List<String> = emptyList()): Single<Unit> = rxSingle {
+        session.joinRoom(roomIdOrAlias, reason, viaServers)
+    }
+
     fun getRoomIdByAlias(roomAlias: String,
                          searchOnServer: Boolean): Single<Optional<RoomAliasDescription>> = rxSingle {
         session.getRoomIdByAlias(roomAlias, searchOnServer)