Ensure that we pull verified state only after getting profiles
FREEBIE
This commit is contained in:
parent
4a1dc46ab3
commit
fc39241003
2 changed files with 12 additions and 11 deletions
|
@ -559,7 +559,7 @@
|
||||||
} else {
|
} else {
|
||||||
ids = this.get('members');
|
ids = this.get('members');
|
||||||
}
|
}
|
||||||
ids.forEach(this.getProfile);
|
return Promise.all(_.map(ids, this.getProfile));
|
||||||
},
|
},
|
||||||
|
|
||||||
getProfile: function(id) {
|
getProfile: function(id) {
|
||||||
|
|
|
@ -306,21 +306,22 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
onOpened: function() {
|
onOpened: function() {
|
||||||
this.model.getProfiles();
|
// TODO: we may want to show a loading dialog until this status fetch
|
||||||
|
// and potentially the below message fetch are complete. In the near
|
||||||
|
// term, just a send block if this statusFetch is incomplete might be
|
||||||
|
// a good idea.
|
||||||
|
this.statusFetch = this.model.getProfiles().then(function() {
|
||||||
|
this.model.updateVerified().then(function() {
|
||||||
|
this.onVerifiedChange.bind(this);
|
||||||
|
this.statusFetch = null;
|
||||||
|
console.log('done with status fetch');
|
||||||
|
}.bind(this));
|
||||||
|
}.bind(this));
|
||||||
|
|
||||||
this.view.resetScrollPosition();
|
this.view.resetScrollPosition();
|
||||||
this.$el.trigger('force-resize');
|
this.$el.trigger('force-resize');
|
||||||
this.focusMessageField();
|
this.focusMessageField();
|
||||||
|
|
||||||
// TODO: do a fetch of all profiles to get the latest identity keys, then:
|
|
||||||
// We have a number of async things happening here:
|
|
||||||
// 1. we need to get contacts before we do anything with groups
|
|
||||||
// 2. we need to get profile information for each contact
|
|
||||||
// 3. we need to get all messages for conversation
|
|
||||||
// 4. we need to get updated verified information for each contact
|
|
||||||
// 5. we perhaps need to throw up the banner if in unverified state
|
|
||||||
this.model.updateVerified().then(this.onVerifiedChange.bind(this));
|
|
||||||
|
|
||||||
if (this.inProgressFetch) {
|
if (this.inProgressFetch) {
|
||||||
this.inProgressFetch.then(this.updateUnread.bind(this));
|
this.inProgressFetch.then(this.updateUnread.bind(this));
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue