EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2630 message: Always try to fetch contacts and requests

main
Dani Palou 2019-01-03 08:37:33 +01:00
parent 79b67560ae
commit 01fd05a168
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/addon/messages/components/confirmed-contacts/confirmed-contacts.ts
View File

@ -87,8 +87,20 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
this.loadMoreError = false;
const limitFrom = refresh ? 0 : this.contacts.length;
let promise;
return this.messagesProvider.getUserContacts(limitFrom).then((result) => {
if (limitFrom === 0) {
// Always try to get latest data from server.
promise = this.messagesProvider.invalidateUserContacts().catch(() => {
// Shouldn't happen.
});
} else {
promise = Promise.resolve();
}
return promise.then(() => {
return this.messagesProvider.getUserContacts(limitFrom);
}).then((result) => {
this.contacts = refresh ? result.contacts : this.contacts.concat(result.contacts);
this.canLoadMore = result.canLoadMore;
}).catch((error) => {
@ -104,9 +116,8 @@ export class AddonMessagesConfirmedContactsComponent implements OnInit, OnDestro
* @return {Promise<any>} Promise resolved when done.
*/
refreshData(refresher?: any): Promise<any> {
return this.messagesProvider.invalidateUserContacts().then(() => {
return this.fetchData(true);
}).finally(() => {
// No need to invalidate contacts, we always try to get the latest.
return this.fetchData(true).finally(() => {
refresher && refresher.complete();
});
}

19
src/addon/messages/components/contact-requests/contact-requests.ts
View File

@ -78,8 +78,20 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
this.loadMoreError = false;
const limitFrom = refresh ? 0 : this.requests.length;
let promise;
return this.messagesProvider.getContactRequests(limitFrom).then((result) => {
if (limitFrom === 0) {
// Always try to get latest data from server.
promise = this.messagesProvider.invalidateContactRequestsCache().catch(() => {
// Shouldn't happen.
});
} else {
promise = Promise.resolve();
}
return promise.then(() => {
return this.messagesProvider.getContactRequests(limitFrom);
}).then((result) => {
this.requests = refresh ? result.requests : this.requests.concat(result.requests);
this.canLoadMore = result.canLoadMore;
}).catch((error) => {
@ -98,9 +110,8 @@ export class AddonMessagesContactRequestsComponent implements OnInit, OnDestroy
// Refresh the number of contacts requests to update badges.
this.messagesProvider.refreshContactRequestsCount();
return this.messagesProvider.invalidateContactRequestsCache().then(() => {
return this.fetchData(true);
}).finally(() => {
// No need to invalidate contact requests, we always try to get the latest.
return this.fetchData(true).finally(() => {
refresher && refresher.complete();
});
}