Skip to content

[FIX] Room subscription issues #1255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diegolmello merged 5 commits into from
Sep 27, 2019
Merged

[FIX] Room subscription issues #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
504be9b
Remove room subscription before subscribing again
diegolmello Sep 27, 2019
8f315e3
Unsubscribe from room on app background
diegolmello Sep 27, 2019
910352a
Remove RoomsListView onFocus animation
diegolmello Sep 27, 2019
ecbcc89
Refactor
diegolmello Sep 27, 2019
d493e31
Merge branch 'develop' into fix.room-subscriptions
diegolmello Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/lib/methods/subscriptions/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export default function subscribeRoom({ rid }) {
let disconnectedListener;
let notifyRoomListener;
let messageReceivedListener;
const typingTimeouts = {};

const handleConnection = () => {
this.loadMissedMessages({ rid }).catch(e => console.log(e));
Expand Down Expand Up @@ -200,12 +199,6 @@ export default function subscribeRoom({ rid }) {
messageReceivedListener.then(removeListener);
messageReceivedListener = false;
}
Object.keys(typingTimeouts).forEach((key) => {
if (typingTimeouts[key]) {
clearTimeout(typingTimeouts[key]);
typingTimeouts[key] = null;
}
});
reduxStore.dispatch(clearUserTyping());
};

Expand Down
14 changes: 11 additions & 3 deletions app/views/RoomView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@ class RoomView extends React.Component {
this.init();
});
}
if (appState === 'background' && appState !== prevProps.appState) {
this.unsubscribe();
}
}

async componentWillUnmount() {
Expand Down Expand Up @@ -234,9 +237,7 @@ class RoomView extends React.Component {
}
}
}
if (this.sub && this.sub.stop) {
this.sub.stop();
}
this.unsubscribe();
if (this.didFocusListener && this.didFocusListener.remove) {
this.didFocusListener.remove();
}
Expand Down Expand Up @@ -282,6 +283,7 @@ class RoomView extends React.Component {
this.setLastOpen(null);
}
RocketChat.readMessages(room.rid, newLastOpen).catch(e => console.log(e));
this.unsubscribe();
this.sub = await RocketChat.subscribeRoom(room);
}
}
Expand Down Expand Up @@ -324,6 +326,12 @@ class RoomView extends React.Component {
}
}

unsubscribe = () => {
if (this.sub && this.sub.stop) {
this.sub.stop();
}
}

observeRoom = (room) => {
const observable = room.observe();
this.subSubscription = observable
Expand Down
2 changes: 1 addition & 1 deletion app/views/RoomsListView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class RoomsListView extends React.Component {
this.willFocusListener = props.navigation.addListener('willFocus', () => {
// Check if there were changes while not focused (it's set on sCU)
if (this.shouldUpdate) {
animateNextTransition();
// animateNextTransition();
this.forceUpdate();
this.shouldUpdate = false;
}
Expand Down