Skip to content

[FIX] Crash when open thread #1395

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 3 commits into from
Nov 18, 2019
Merged

[FIX] Crash when open thread #1395

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20d7303
Fix find thread
djorkaeffalexandre Nov 18, 2019
3ce0bce
Merge branch 'develop' into fix.thread-find
diegolmello Nov 18, 2019
76febb7
Merge branch 'develop' into fix.thread-find
diegolmello Nov 18, 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
24 changes: 15 additions & 9 deletions app/views/RoomView/Header/RightButtons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ class RightButtonsContainer extends React.PureComponent {
}

async componentDidMount() {
const { tmid, userId } = this.props;
const { tmid } = this.props;
if (tmid) {
const db = database.active;
const threadObservable = await db.collections.get('messages').findAndObserve(tmid);
this.threadSubscription = threadObservable.subscribe((thread) => {
this.setState({
isFollowingThread: thread.replies && !!thread.replies.find(t => t === userId)
});
});
try {
const threadRecord = await db.collections.get('messages').find(tmid);
this.observeThead(threadRecord);
} catch (e) {
console.log('Can\'t find message to observe.');
}
}
}

Expand All @@ -57,10 +57,16 @@ class RightButtonsContainer extends React.PureComponent {
}
}

updateThread = () => {
observeThead = (threadRecord) => {
const threadObservable = threadRecord.observe();
this.threadSubscription = threadObservable
.subscribe(thread => this.updateThread(thread));
}

updateThread = (thread) => {
const { userId } = this.props;
this.setState({
isFollowingThread: this.thread.replies && !!this.thread.replies.find(t => t === userId)
isFollowingThread: thread.replies && !!thread.replies.find(t => t === userId)
});
}

Expand Down