Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 22:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: StorageResultType to error result code

Browse source
This commit is contained in:
djmaze 2021-03-16 09:46:23 +01:00
parent be3ef15f8e
commit 4a8d516123
33 changed files with 257 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

19
dev/View/Popup/Contacts.js
View file

@ -2,7 +2,6 @@ import ko from 'ko';
import {
SaveSettingsStep,
StorageResultType,
Notification,
KeyState
} from 'Common/Enums';
@ -224,12 +223,12 @@ class ContactsPopupView extends AbstractViewPopup {
const requestUid = Jua.randomId();
Remote.contactSave(
(sResult, oData) => {
(iError, oData) => {
let res = false;
this.viewSaving(false);
if (
StorageResultType.Success === sResult &&
!iError &&
oData &&
oData.Result &&
oData.Result.RequestUid === requestUid &&
@ -259,8 +258,8 @@ class ContactsPopupView extends AbstractViewPopup {
}
syncCommand() {
rl.app.contactsSync((result, data) => {
if (StorageResultType.Success !== result || !data || !data.Result) {
rl.app.contactsSync((iError, data) => {
if (iError || !data || !data.Result) {
alert(getNotification(data && data.ErrorCode ? data.ErrorCode : Notification.ContactsSyncError));
}
@ -398,11 +397,11 @@ class ContactsPopupView extends AbstractViewPopup {
}
/**
* @param {string} sResult
* @param {int} iError
* @param {FetchJsonDefaultResponse} oData
*/
deleteResponse(sResult, oData) {
if (500 < (StorageResultType.Success === sResult && oData && oData.Time ? pInt(oData.Time) : 0)) {
deleteResponse(iError, oData) {
if (500 < (!iError && oData && oData.Time ? pInt(oData.Time) : 0)) {
this.reloadContactList(this.bDropPageAfterDelete);
} else {
setTimeout(() => {
@ -460,11 +459,11 @@ class ContactsPopupView extends AbstractViewPopup {
ContactUserStore.loading(true);
Remote.contacts(
(result, data) => {
(iError, data) => {
let count = 0,
list = [];
if (StorageResultType.Success === result && data && data.Result && data.Result.List) {
if (!iError && data && data.Result && data.Result.List) {
if (Array.isNotEmpty(data.Result.List)) {
data.Result.List.forEach(item => {
item = ContactModel.reviveFromJson(item);