Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Remove Room.getLiveState() and keep only Room.getState() #319

Merged
merged 3 commits into from
Jul 16, 2018

Conversation

Tyuoli
Copy link
Contributor

@Tyuoli Tyuoli commented Jul 16, 2018

because they are similar.

Related to #310

@Tyuoli Tyuoli requested a review from bmarty July 16, 2018 15:48
CHANGES.rst Outdated
@@ -17,6 +17,7 @@ Bugfix:
API Change:
- Parameter historyVisibility removed from MxSession.createRoom(). It had no effect.
- New API: CreateRoomParams.setHistoryVisibility(String historyVisibility) to force the history visibility during Room creation.
- New API: use only the method Room.getState() and remove Room.getLiveState() because they are similar.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace this line with:
- Room.getLiveState() has been removed, please use Room.getState()

@@ -3023,7 +3021,7 @@ public void onSuccess(Void info) {
// - Alice and Bob start sharing a room again
CountDownLatch lock3 = new CountDownLatch(1);
aliceSession2.createRoom(null, null, RoomState.DIRECTORY_VISIBILITY_PUBLIC, null, RoomState.GUEST_ACCESS_CAN_JOIN,
RoomState.HISTORY_VISIBILITY_SHARED, null, new TestApiCallback<String>(lock3) {
null, new TestApiCallback<String>(lock3) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this has been updated?

@@ -2430,8 +2430,7 @@ public void test25_testLeftAndJoinedBob() throws Exception {
mBobSession.getCrypto().setWarnOnUnknownDevices(false);

CountDownLatch lock0 = new CountDownLatch(1);
mAliceSession.createRoom(null, null, RoomState.DIRECTORY_VISIBILITY_PUBLIC, null, RoomState.GUEST_ACCESS_CAN_JOIN,
RoomState.HISTORY_VISIBILITY_SHARED, null, new TestApiCallback<String>(lock0) {
mAliceSession.createRoom(null, null, RoomState.DIRECTORY_VISIBILITY_PUBLIC, null, RoomState.GUEST_ACCESS_CAN_JOIN, null, new TestApiCallback<String>(lock0) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this has been updated?

@@ -2902,8 +2901,7 @@ public void onSuccess(Void info) {
mBobSession.getCrypto().setWarnOnUnknownDevices(false);

CountDownLatch lock0 = new CountDownLatch(1);
mAliceSession.createRoom(null, null, RoomState.DIRECTORY_VISIBILITY_PUBLIC, null, RoomState.GUEST_ACCESS_CAN_JOIN,
RoomState.HISTORY_VISIBILITY_SHARED, null, new TestApiCallback<String>(lock0) {
mAliceSession.createRoom(null, null, RoomState.DIRECTORY_VISIBILITY_PUBLIC, null, RoomState.GUEST_ACCESS_CAN_JOIN,null, new TestApiCallback<String>(lock0) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this has been updated?

@bmarty bmarty merged commit 6bbe7ea into develop Jul 16, 2018
@bmarty bmarty deleted the riot_sdk_310 branch August 8, 2018 14:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants