Skip to content

Commit

Permalink
Clean up this file
Browse files Browse the repository at this point in the history
- remove unused imports
- use logDebug, logInfo, logWarn, format nicely
- replace ionic.Platform.isIOS / isAndroid with cordova.platformId
  • Loading branch information
JGreenlee authored Nov 21, 2023
1 parent 7480b92 commit b81493c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
2 changes: 0 additions & 2 deletions www/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import './js/main.js';
import './js/diary.js';
import './js/diary/services.js';
import './js/survey/enketo/answer.js';
//import './js/survey/enketo/enketo-trip-button.js';
//import './js/survey/enketo/enketo-add-note-button.js';
import './js/metrics-factory.js';
import './js/metrics-mappings.js';
import './js/plugin/logger.ts';
18 changes: 7 additions & 11 deletions www/js/control/emailService.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { useEffect, useState } from 'react';
import i18next from 'i18next';
import { logInfo, logDebug, displayError } from '../plugin/logger';
import { logDebug, logInfo, logWarn } from '../plugin/logger';

async function hasAccount(): Promise<boolean> {
return new Promise<boolean>((resolve, reject) => {
Expand All @@ -13,18 +12,18 @@ async function hasAccount(): Promise<boolean> {
export async function sendEmail(database: string) {
let parentDir = 'unknown';

if (window['ionic'].Platform.isIOS() && !(await hasAccount())) {
if (window['cordova'].platformId == 'ios' && !(await hasAccount())) {
alert(i18next.t('email-service.email-account-not-configured'));
return;
}

if (window['ionic'].Platform.isAndroid()) {
if (window['cordova'].platformId) == 'android') {
parentDir = 'app://databases';
}

if (window['ionic'].Platform.isIOS()) {
if (window['cordova'].platformId) == 'ios') {
alert(i18next.t('email-service.email-account-mail-app'));
console.log(window['cordova'].file.dataDirectory);
logDebug(window['cordova'].file.dataDirectory);
parentDir = window['cordova'].file.dataDirectory + '../LocalDatabase';
}

Expand All @@ -47,10 +46,7 @@ export async function sendEmail(database: string) {
};

window['cordova'].plugins['email'].open(emailData, () => {
logInfo(
'Email app closed while sending, ' +
JSON.stringify(emailData) +
' not sure if we should do anything',
);
logWarn(`Email app closed while sending,
emailData = ${JSON.stringify(emailData)}`);
});
}

0 comments on commit b81493c

Please sign in to comment.