Skip to content

Commit c2db21a

Browse files
Fix nucleus reporter
1 parent bb8e230 commit c2db21a

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

electron_app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"@criptext/api": "^0.15.18",
137137
"@criptext/data-transfer-client": "^0.1.1",
138138
"@criptext/electron-better-ipc": "^0.1.2-rc5",
139-
"@criptext/electron-push-receiver": "^2.1.2",
139+
"@criptext/electron-push-receiver": "^2.1.2-rc1",
140140
"@criptext/news-api-client": "^1.0.1",
141141
"dotenv": "^6.2.0",
142142
"electron-context-menu": "^0.10.1",

electron_app/src/BackupManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ const createTempEmailsBackup = () => {
121121
const EmailsFolder = getUserEmailsPath(process.env.NODE_ENV, getUsername());
122122
return new Promise((resolve, reject) => {
123123
try {
124-
copy(EmailsFolder, TempEmailsBackupPath);
124+
copy(EmailsFolder, TempEmailsBackupPath, { overwrite: true });
125125
resolve();
126126
} catch (error) {
127127
reject({ error: 'Preparing backup error' });

electron_app/src/windows/mailbox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const create = () => {
7070
mailboxWindow.on('close', e => {
7171
if (!globalManager.forcequit.get()) {
7272
e.preventDefault();
73-
if (mailboxWindow.isFullScreen()) {
73+
if (mailboxWindow && mailboxWindow.isFullScreen()) {
7474
mailboxWindow.setFullScreen(false);
7575
setTimeout(() => hide(), 1200);
7676
} else {

electron_app/yarn.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@
113113
version "0.1.2-rc5"
114114
resolved "https://registry.yarnpkg.com/@criptext/electron-better-ipc/-/electron-better-ipc-0.1.2-rc5.tgz#4a51755de1168b441fe6a68872fe8b95eaa742ab"
115115

116-
"@criptext/electron-push-receiver@^2.1.2":
117-
version "2.1.2"
118-
resolved "https://registry.yarnpkg.com/@criptext/electron-push-receiver/-/electron-push-receiver-2.1.2.tgz#d971523d21bb473e9340f157af0c30760f7c417b"
119-
integrity sha512-1QIx54AuC/XtdO37a7ExXF1yoKvyEnq7kXnsCGo1mTh9ER3hNqS9ox8hpBPRuA7TgkH2dQzDeAqsQS7IflsKMw==
116+
"@criptext/electron-push-receiver@^2.1.2-rc1":
117+
version "2.1.2-rc1"
118+
resolved "https://registry.yarnpkg.com/@criptext/electron-push-receiver/-/electron-push-receiver-2.1.2-rc1.tgz#4c6be8acc7d5d17390a31872b52228866f757643"
119+
integrity sha512-rYy1ZW5vQ6Z8QuMGMomXW7vKUXHbnsr4rMr7ee1aDjnNA3wzAMDWVTKiYmI3r9NFdnYTmIs2MwKCrQ4PQHy+rw==
120120
dependencies:
121121
electron-config "^1.0.0"
122122
push-receiver "^2.0.2"
@@ -186,9 +186,9 @@
186186
integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q==
187187

188188
"@types/node@^10.1.0":
189-
version "10.14.4"
190-
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.4.tgz#1c586b991457cbb58fef51bc4e0cfcfa347714b5"
191-
integrity sha512-DT25xX/YgyPKiHFOpNuANIQIVvYEwCWXgK2jYYwqgaMrYE6+tq+DtmMwlD3drl6DJbUwtlIDnn0d7tIn/EbXBg==
189+
version "10.14.16"
190+
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.16.tgz#4d690c96cbb7b2728afea0e260d680501b3da5cf"
191+
integrity sha512-/opXIbfn0P+VLt+N8DE4l8Mn8rbhiJgabU96ZJ0p9mxOkIks5gh6RUnpHak7Yh0SFkyjO/ODbxsQQPV2bpMmyA==
192192

193193
"@types/node@^8.0.24":
194194
version "8.10.49"
@@ -3349,9 +3349,9 @@ lodash@^4.13.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
33493349
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
33503350

33513351
lodash@^4.17.11:
3352-
version "4.17.11"
3353-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
3354-
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
3352+
version "4.17.15"
3353+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
3354+
integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
33553355

33563356
long@^3.2.0:
33573357
version "3.2.0"
@@ -5446,9 +5446,9 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.1.0:
54465446
signal-exit "^3.0.2"
54475447

54485448
write-file-atomic@^2.3.0:
5449-
version "2.4.2"
5450-
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.2.tgz#a7181706dfba17855d221140a9c06e15fcdd87b9"
5451-
integrity sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==
5449+
version "2.4.3"
5450+
resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz#1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"
5451+
integrity sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==
54525452
dependencies:
54535453
graceful-fs "^4.1.11"
54545454
imurmurhash "^0.1.4"

email_mailbox/src/components/SettingBlockProfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const renderBlockAvatar = props => (
4848
type="file"
4949
name="fileAvatar"
5050
id="fileAvatar"
51-
accept="image/*"
51+
accept="image/x-png,image/jpeg"
5252
onChange={props.onChangeAvatar}
5353
/>
5454
<label htmlFor={props.avatarIsLoading ? null : 'fileAvatar'}>

email_mailbox/src/components/settingblockprofile.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@
8080
input{
8181
display: none;
8282
}
83+
84+
label{
85+
cursor: pointer;
86+
}
8387
}
8488
}
8589

email_mailbox/src/utils/electronEventInterface.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ const parseAndStoreEventsBatch = async ({ events, hasMoreEvents }) => {
187187
};
188188

189189
const parseAndDispatchEvent = async event => {
190-
isGettingEvents = true;
191190
try {
192191
const { rowid } = await handleEvent(event);
193192
if (rowid) await setEventAsHandled([rowid]);
@@ -196,7 +195,6 @@ const parseAndDispatchEvent = async event => {
196195
console.error(error);
197196
sendFetchEmailsErrorMessage();
198197
}
199-
isGettingEvents = false;
200198
};
201199

202200
export const getGroupEvents = async ({
@@ -1006,7 +1004,9 @@ ipcRenderer.on('socket-message', async (ev, message) => {
10061004
sendLoadEventsEvent({ showNotification: true });
10071005
} else {
10081006
if (isGettingEvents) return;
1007+
isGettingEvents = true;
10091008
await parseAndDispatchEvent(message);
1009+
isGettingEvents = false;
10101010
}
10111011
});
10121012

0 commit comments

Comments
 (0)