From b81493c138647e08d013f461091cc10349a400a8 Mon Sep 17 00:00:00 2001
From: Jack Greenlee <JackAGreenlee@gmail.com>
Date: Tue, 21 Nov 2023 11:24:03 -0500
Subject: [PATCH] Clean up this file

- remove unused imports
- use logDebug, logInfo, logWarn, format nicely
- replace ionic.Platform.isIOS / isAndroid with cordova.platformId
---
 www/index.js                   |  2 --
 www/js/control/emailService.ts | 18 +++++++-----------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/www/index.js b/www/index.js
index 865cc9a32..0ae3896a2 100644
--- a/www/index.js
+++ b/www/index.js
@@ -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';
diff --git a/www/js/control/emailService.ts b/www/js/control/emailService.ts
index 0efca1518..601413546 100644
--- a/www/js/control/emailService.ts
+++ b/www/js/control/emailService.ts
@@ -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) => {
@@ -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';
   }
 
@@ -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)}`);
   });
 }