Skip to content

Commit 033f603

Browse files
JulianAdams4JulianAdams4
authored
Merge pull request #1182 from JulianAdams4/urgentFixes
Some fixes 3
2 parents 756330d + dfe83ec commit 033f603

File tree

16 files changed

+181
-94
lines changed

16 files changed

+181
-94
lines changed

‎CHANGELOG.md‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
11
# Change Log
22

3-
## [Unreleased](https://github.com/criptext/Criptext-Email-React-Client/tree/HEAD)
3+
## [0.23.9](https://github.com/criptext/Criptext-Email-React-Client/tree/HEAD)
44

5-
[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.23.4...HEAD)
5+
[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.23.6...HEAD)
6+
7+
**Implemented enhancements:**
8+
9+
- Some fixes [\#1172](https://github.com/Criptext/Criptext-Email-React-Client/issues/1172)
10+
11+
**Fixed bugs:**
12+
13+
- Some Fixes 2 [\#1175](https://github.com/Criptext/Criptext-Email-React-Client/issues/1175)
14+
- Mailbox/App: Fix paralleling file download [\#1170](https://github.com/Criptext/Criptext-Email-React-Client/issues/1170)
15+
- Critical bug: client does not allow letters to some real emails! [\#1164](https://github.com/Criptext/Criptext-Email-React-Client/issues/1164)
16+
17+
**Closed issues:**
18+
19+
- Multiple Accounts [\#1173](https://github.com/Criptext/Criptext-Email-React-Client/issues/1173)
20+
21+
**Merged pull requests:**
22+
23+
- Accept external email addresses format [\#1179](https://github.com/Criptext/Criptext-Email-React-Client/pull/1179) ([JulianAdams4](https://github.com/JulianAdams4))
24+
- Fix mailbox loading issue [\#1178](https://github.com/Criptext/Criptext-Email-React-Client/pull/1178) ([JulianAdams4](https://github.com/JulianAdams4))
25+
- Fixes 2 [\#1177](https://github.com/Criptext/Criptext-Email-React-Client/pull/1177) ([JulianAdams4](https://github.com/JulianAdams4))
26+
- Some Fixes [\#1174](https://github.com/Criptext/Criptext-Email-React-Client/pull/1174) ([JulianAdams4](https://github.com/JulianAdams4))
27+
- Fix paralleling file download [\#1171](https://github.com/Criptext/Criptext-Email-React-Client/pull/1171) ([JulianAdams4](https://github.com/JulianAdams4))
28+
- Update version .23.7 [\#1169](https://github.com/Criptext/Criptext-Email-React-Client/pull/1169) ([erikaperugachi](https://github.com/erikaperugachi))
29+
- Optimizing Queries & Fix advanced search [\#1168](https://github.com/Criptext/Criptext-Email-React-Client/pull/1168) ([JulianAdams4](https://github.com/JulianAdams4))
30+
31+
## [0.23.6](https://github.com/criptext/Criptext-Email-React-Client/tree/0.23.6) (2019-09-11)
32+
[Full Changelog](https://github.com/criptext/Criptext-Email-React-Client/compare/0.23.4...0.23.6)
633

734
**Implemented enhancements:**
835

@@ -19,6 +46,7 @@
1946

2047
**Merged pull requests:**
2148

49+
- Update [\#1167](https://github.com/Criptext/Criptext-Email-React-Client/pull/1167) ([erikaperugachi](https://github.com/erikaperugachi))
2250
- ⚠⚠⚠ Fix: Missing loading window [\#1166](https://github.com/Criptext/Criptext-Email-React-Client/pull/1166) ([JulianAdams4](https://github.com/JulianAdams4))
2351
- Fix [\#1163](https://github.com/Criptext/Criptext-Email-React-Client/pull/1163) ([erikaperugachi](https://github.com/erikaperugachi))
2452
- Const [\#1161](https://github.com/Criptext/Criptext-Email-React-Client/pull/1161) ([Hirobreak](https://github.com/Hirobreak))

‎electron_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "criptext",
3-
"version": "0.23.8",
3+
"version": "0.23.9",
44
"author": {
55
"name": "Criptext Inc",
66
"email": "[email protected]",

‎electron_app/src/DBManager.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ const getEmailsGroupByThreadByParams = async (params = {}) => {
710710
GROUP BY uniqueId, ${Table.EMAIL_LABEL}.emailId
711711
${customRejectedLabels}
712712
ORDER BY ${Table.EMAIL}.date DESC
713-
LIMIT 100
714713
)
715714
GROUP BY threadId
716715
${labelId > 0 ? `HAVING myAllLabels LIKE "%L${labelId}L%"` : ''}

‎electron_app/src/globalManager.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ global.internetConnection;
1313
global.isWindowsStore = INSTALLER_TYPE === allInstallerTypes.windows.store;
1414
global.deviceType = getDeviceType(INSTALLER_TYPE, allInstallerTypes);
1515
global.pendingRestore = false;
16+
global.backupStatus = null;
1617

1718
/* Composer
1819
----------------------------- */
@@ -122,6 +123,15 @@ const getPendingRestoreStatus = () => {
122123
return global.pendingRestore;
123124
};
124125

126+
/* Backup status
127+
----------------------------- */
128+
const setBackupStatus = status => {
129+
global.backupStatus = status;
130+
};
131+
const getBackupStatus = () => {
132+
return global.backupStatus;
133+
};
134+
125135
module.exports = {
126136
composerData: {
127137
get: getComposerData,
@@ -170,5 +180,9 @@ module.exports = {
170180
pendingRestore: {
171181
get: getPendingRestoreStatus,
172182
set: setPendingRestoreStatus
183+
},
184+
backupStatus: {
185+
get: getBackupStatus,
186+
set: setBackupStatus
173187
}
174188
};

‎electron_app/src/ipc/backup.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const simulatePause = ms => {
2929

3030
const commitBackupStatus = (eventName, status, params) => {
3131
sendEventToAllWindows(eventName, params);
32-
if (status) globalManager.backupStatus = status;
32+
globalManager.backupStatus.set(status);
3333
};
3434

3535
ipc.answerRenderer('create-default-backup-folder', () =>
@@ -46,9 +46,9 @@ const doExportBackupUnencrypted = async params => {
4646
globalManager.windowsEvents.enable();
4747
commitBackupStatus('local-backup-enable-events', 2);
4848
const backupSize = await exportBackupUnencrypted({ backupPath });
49-
commitBackupStatus('local-backup-export-finished', 3);
49+
commitBackupStatus('local-backup-export-finished', 3, backupSize);
5050
await simulatePause(2000);
51-
commitBackupStatus('local-backup-success', null, backupSize);
51+
commitBackupStatus('local-backup-success', null);
5252
await simulatePause(2000);
5353
if (notificationParams) {
5454
showNotification({
@@ -90,9 +90,9 @@ ipc.answerRenderer('export-backup-encrypted', async params => {
9090
backupPath,
9191
password
9292
});
93-
commitBackupStatus('local-backup-export-finished', 3);
93+
commitBackupStatus('local-backup-export-finished', 3, backupSize);
9494
await simulatePause(2000);
95-
commitBackupStatus('local-backup-success', null, backupSize);
95+
commitBackupStatus('local-backup-success', null);
9696
await simulatePause(2000);
9797
if (notificationParams) {
9898
showNotification({

‎electron_app/src/migrations/20190919153109_fixDraftDates.js‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎electron_app/src/migrations/20190925153109_fixDraftDates.js‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
const moment = require('moment');
2+
const { Table } = require('../models');
3+
const emailDateFormat = 'YYYY-MM-DD HH:mm:ss';
4+
5+
const parseDateToQuery = date => {
6+
return date ? `"${moment(date).format(emailDateFormat)}"` : date;
7+
};
8+
9+
const fixDraftDates = async knex => {
10+
const limit = 100;
11+
let emailsToUpdate = [];
12+
const LABELID_TO_FIX = 6;
13+
await knex.transaction(async trx => {
14+
do {
15+
emailsToUpdate = await trx.raw(
16+
`SELECT ${Table.EMAIL}.*
17+
FROM ${Table.EMAIL}
18+
JOIN ${Table.EMAIL_LABEL}
19+
ON ${Table.EMAIL}.id = ${Table.EMAIL_LABEL}.emailId
20+
WHERE ${Table.EMAIL_LABEL}.labelId = ${LABELID_TO_FIX}
21+
AND ${Table.EMAIL}.isMuted = 0
22+
LIMIT ${limit}`
23+
);
24+
await Promise.all(
25+
emailsToUpdate.map(async email => {
26+
await trx.raw(`
27+
UPDATE
28+
${Table.EMAIL}
29+
SET
30+
isMuted = 1,
31+
date = ${parseDateToQuery(email.date)},
32+
trashDate = ${parseDateToQuery(email.trashDate)},
33+
unsendDate = ${parseDateToQuery(email.unsendDate)}
34+
WHERE
35+
${Table.EMAIL}.id = ${email.id}
36+
`);
37+
})
38+
);
39+
} while (emailsToUpdate.length > 0);
40+
});
41+
};
42+
43+
exports.up = async (knex, Promise) => {
44+
const fixDates = fixDraftDates(knex);
45+
return await Promise.all([fixDates]);
46+
};
47+
48+
exports.down = (knex, Promise) => {
49+
return Promise.resolve(true);
50+
};

‎electron_app/src/models.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,25 @@ const createTables = async () => {
342342
.createTable(Table.IDENTITYKEYRECORD, createIdentityKeyRecordColumns)
343343
.createTable(Table.SETTINGS, createSettingsColumns);
344344
}
345+
await removeDraftDatesMigration();
345346
await migrateDatabase();
346347
};
347348

349+
const removeDraftDatesMigration = async () => {
350+
const draftDatesTimestamp = '20190919153109';
351+
await removeSpecificMigration(draftDatesTimestamp);
352+
};
353+
354+
const removeSpecificMigration = async timestamp => {
355+
const migrationExists = await db.schema.hasTable(Table.MIGRATIONS);
356+
if (migrationExists) {
357+
await db
358+
.table(Table.MIGRATIONS)
359+
.where('name', 'like', `${timestamp}%`)
360+
.del();
361+
}
362+
};
363+
348364
const rollbackAllMigrations = async () => {
349365
let version;
350366
while (version !== 'none') {

‎email_composer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_composer",
3-
"version": "0.23.8",
3+
"version": "0.23.9",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.1.2-rc5",

‎email_loading/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "email_loading",
3-
"version": "0.23.8",
3+
"version": "0.23.9",
44
"private": true,
55
"dependencies": {
66
"@criptext/electron-better-ipc": "^0.1.2-rc5",

0 commit comments

Comments
 (0)