Skip to content

Commit 40182a3

Browse files
author
Pedro Aim
committed
more fixes
1 parent 99a184f commit 40182a3

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed

electron_app/src/database/DBEmodel.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const Model = Sequelize.Model;
1010
const Op = Sequelize.Op;
1111
const { parseDate, formatDate } = require('./../utils/TimeUtils');
1212
const { DEFAULT_PIN } = require('./../utils/const');
13+
const logger = require('../logger');
1314

1415
let sequelize;
1516

@@ -609,7 +610,7 @@ const initDatabaseEncrypted = async (
609610
}
610611
);
611612
} catch (ex) {
612-
console.error(ex);
613+
logger.error(ex);
613614
}
614615
};
615616

electron_app/src/ipc/backup.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ const doExportBackupUnencrypted = async params => {
7070
: myAccount.recipientId.split('@');
7171

7272
logger.info(
73-
`Unencrypted Backup Started For Account: ${recipientId}@${domain}`
73+
`Unencrypted Backup Started For Account: ${recipientId}@${domain ||
74+
APP_DOMAIN}`
7475
);
7576

7677
handleProgressCallback(
@@ -242,7 +243,7 @@ const initAutoBackupMonitor = () => {
242243

243244
if (!currentAutobackup) checkNextBackup();
244245

245-
logger.debug(`Backups Started : ${JSON.stringify(autoBackupsTime)}`);
246+
logger.debug(`Backups : ${JSON.stringify(autoBackupsTime)}`);
246247
};
247248

248249
const checkNextBackup = () => {
@@ -255,7 +256,7 @@ const checkNextBackup = () => {
255256
});
256257

257258
logger.debug(
258-
`Next Account : ${autoBackupsTime[0].accountId} : $ ${
259+
`Next Backup : ${autoBackupsTime[0].accountId} : $ ${
259260
autoBackupsTime[0].username
260261
} in ${autoBackupsTime[0].triggerTimer} miliseconds`
261262
);
@@ -301,15 +302,15 @@ const initAutoBackup = async accountId => {
301302
const today = moment(Date.now());
302303
const nextDate = moment(autoBackupNextDate);
303304
do {
304-
nextDate.add(1, 'hours');
305+
nextDate.add(1, timeUnit);
305306
} while (nextDate.isBefore(today));
306307
await updateAccount({
307308
id: accountId,
308309
autoBackupLastDate: today.format(backupDateFormat),
309310
autoBackupLastSize: backupSize,
310311
autoBackupNextDate: nextDate.format(backupDateFormat)
311312
});
312-
logger.debug(`Backups Finished : ${accountId}`);
313+
logger.debug(`Backup Finished : ${accountId}`);
313314
const timeDiff = nextDate.diff(today);
314315
autoBackupsTime.push({
315316
username: account.recipientId,

electron_app/src/windows/composer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ const createComposerWindow = () => {
9191
showCopyImageAddress: false,
9292
prepend: (defaultActions, browserWindow) => {
9393
const checker = new spellChecker.Spellchecker();
94-
checker.setSpellcheckerType(spellChecker.ALWAYS_USE_HUNSPELL);
9594

9695
let options = [];
9796
if (defaultActions.misspelledWord) {

email_composer/src/utils/electronInterface.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export const sendEventToMailbox = (name, params) => {
3838
webFrame.setSpellCheckProvider(mySettings.language, {
3939
spellCheck(words, callback) {
4040
const checker = new spellChecker.Spellchecker();
41-
checker.setSpellcheckerType(spellChecker.ALWAYS_USE_HUNSPELL);
4241
const misspelled = words.filter(x => {
4342
return checker.isMisspelled(x);
4443
});

email_mailbox/src/components/PanelWrapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ class PanelWrapper extends Component {
270270
handleEnableAccountBackup = async backupPath => {
271271
const frequency = 'daily';
272272
const timeUnit = 'days';
273-
const { nextDate } = getAutoBackupDates(Date.now(), 1, 'hours');
273+
const { nextDate } = getAutoBackupDates(Date.now(), 1, timeUnit);
274274

275275
await updateAccount({
276276
autoBackupEnable: true,

email_mailbox/src/components/SettingsAccountBackupWrapper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ class SettingsAccountBackupWrapper extends Component {
396396
updateAutoBackupParams = async backupSize => {
397397
const { selectedFrequency, backupPath } = this.state;
398398
const timeUnit = defineUnitToAppend(selectedFrequency);
399-
const { nowDate, nextDate } = getAutoBackupDates(Date.now(), 1, 'hours');
399+
const { nowDate, nextDate } = getAutoBackupDates(Date.now(), 1, timeUnit);
400400
const autoBackupPath = removeFilenameFromPath(backupPath);
401401
await updateAccount({
402402
autoBackupEnable: true,

email_mailbox/src/components/popuphoc.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
}
66

77
.popup-container{
8-
box-shadow: 0 1px 16px 0 rgba(143, 143, 143, 0.56);
98
border: solid 1px transparent;
109
border-radius: 15px;
1110
position: absolute;

email_mailbox/src/components/threads.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
.threads-content{
5656
overflow-y: auto;
57-
height: calc(100% - 125px);
57+
height: calc(100% - 124px);
5858
padding: 44px 20px 20px 20px;
5959
position: relative;
6060
width: calc(100% - 40px);

0 commit comments

Comments
 (0)