Skip to content

[FIX] ThreadMessagesView crashing on load #1997

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 2 commits into from
Apr 6, 2020
Merged

[FIX] ThreadMessagesView crashing on load #1997

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5156182
[FIX] ThreadMessagesView crashing on load
diegolmello Apr 6, 2020
c1730de
Merge branch 'develop' into fix.thread-messages-view
diegolmello Apr 6, 2020
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
38 changes: 21 additions & 17 deletions app/views/ThreadMessagesView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ class ThreadMessagesView extends React.Component {
}

componentWillUnmount() {
console.countReset(`${ this.constructor.name }.render calls`);
if (this.mountInteraction && this.mountInteraction.cancel) {
this.mountInteraction.cancel();
}
if (this.loadInteraction && this.loadInteraction.cancel) {
this.loadInteraction.cancel();
}
if (this.syncInteraction && this.syncInteraction.cancel) {
this.syncInteraction.cancel();
}
Expand All @@ -89,13 +87,14 @@ class ThreadMessagesView extends React.Component {
}

// eslint-disable-next-line react/sort-comp
subscribeData = () => {
subscribeData = async() => {
try {
const db = database.active;
this.subObservable = db.collections
const subscription = await db.collections
.get('subscriptions')
.findAndObserve(this.rid);
this.subSubscription = this.subObservable
.find(this.rid);
const observable = subscription.observe();
this.subSubscription = observable
.subscribe((data) => {
this.subscription = data;
});
Expand All @@ -116,14 +115,14 @@ class ThreadMessagesView extends React.Component {
}
});
} catch (e) {
log(e);
// Do nothing
}
}

// eslint-disable-next-line react/sort-comp
init = () => {
if (!this.subscription) {
return;
this.load();
}
try {
const lastThreadSync = new Date();
Expand All @@ -138,6 +137,13 @@ class ThreadMessagesView extends React.Component {
}

updateThreads = async({ update, remove, lastThreadSync }) => {
// if there's no subscription, manage data on this.state.messages
// note: sync will never be called without subscription
if (!this.subscription) {
this.setState(({ messages }) => ({ messages: [...messages, ...update] }));
return;
}

try {
const db = database.active;
const threadsCollection = db.collections.get('threads');
Expand Down Expand Up @@ -198,13 +204,10 @@ class ThreadMessagesView extends React.Component {
rid: this.rid, count: API_FETCH_COUNT, offset: messages.length
});
if (result.success) {
this.loadInteraction = InteractionManager.runAfterInteractions(() => {
this.updateThreads({ update: result.threads, lastThreadSync });

this.setState({
loading: false,
end: result.count < API_FETCH_COUNT
});
this.updateThreads({ update: result.threads, lastThreadSync });
this.setState({
loading: false,
end: result.count < API_FETCH_COUNT
});
}
} catch (e) {
Expand Down Expand Up @@ -319,6 +322,7 @@ class ThreadMessagesView extends React.Component {
}

render() {
console.count(`${ this.constructor.name }.render calls`);
const { loading, messages } = this.state;
const { theme } = this.props;

Expand All @@ -335,7 +339,7 @@ class ThreadMessagesView extends React.Component {
renderItem={this.renderItem}
style={[styles.list, { backgroundColor: themes[theme].backgroundColor }]}
contentContainerStyle={styles.contentContainer}
keyExtractor={item => item.id}
keyExtractor={item => item._id}
onEndReached={this.load}
onEndReachedThreshold={0.5}
maxToRenderPerBatch={5}
Expand Down