-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1160 from the-bay-kay/fix_log_email
✉️📭 Refractored `emailService.ts` into `shareLocalDBFile.ts`
- Loading branch information
Showing
8 changed files
with
135 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ | |
| "force-sync": "Force sync", | ||
| "share": "Share", | ||
| "download-json-dump": "Download json dump", | ||
| "email-log": "Email log", | ||
| "share-log": "Share log", | ||
| "upload-log": "Upload log", | ||
| "view-privacy": "View Privacy Policy", | ||
| "user-data": "User data", | ||
|
|
@@ -278,16 +278,14 @@ | |
| "reading-unprocessed-data": "Reading unprocessed data..." | ||
| }, | ||
|
|
||
| "email-service": { | ||
| "email-account-not-configured": "Email account is not configured, cannot send email", | ||
| "email-account-mail-app": "You must have the mail app on your phone configured with an email address. Otherwise, this won't work", | ||
| "going-to-email": "Going to email database from {{parentDir}}", | ||
| "email-log": { | ||
| "shareFile-service": { | ||
| "send-to": "Please send this file to [email protected], or another OpenPATH team member.", | ||
| "send-log": { | ||
| "subject-logs": "emission logs", | ||
| "body-please-fill-in-what-is-wrong": "please fill in what is wrong" | ||
| }, | ||
| "no-email-address-configured": "No email address configured.", | ||
| "email-data": { | ||
| "send-data": { | ||
| "subject-data-dump-from-to": "Data dump from {{start}} to {{end}}", | ||
| "body-data-consists-of-list-of-entries": "Data consists of a list of entries.\nEntry formats are at https://github.com/e-mission/e-mission-server/tree/master/emission/core/wrapper \nData can be loaded locally using instructions at https://github.com/e-mission/e-mission-server#loading-test-data \n and can be manipulated using the example at https://github.com/e-mission/e-mission-server/blob/master/Timeseries_Sample.ipynb" | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| import i18next from 'i18next'; | ||
| import { displayError, displayErrorMsg, logDebug, logWarn } from '../plugin/logger'; | ||
|
|
||
| function localDBHelpers(fileName: string, fileExtension: string = '.txt') { | ||
| async function localCopyFile() { | ||
| return new Promise<void>((resolve, reject) => { | ||
| let pathToFile, parentDirectory; | ||
| if (window['cordova'].platformId == 'android') { | ||
| // parentDirectory: file:///data/user/0/edu.berkeley.eecs.emission/files/ | ||
| parentDirectory = window['cordova'].file.dataDirectory.replace('files', 'databases'); | ||
| // pathToFile: /data/user/0/edu.berkeley.eecs.emission/files/ | ||
| pathToFile = parentDirectory.replace('file://', '') + fileName; | ||
| } else if (window['cordova'].platformId == 'ios') { | ||
| // parentDirectory: file:///var/mobile/Containers/Data/Application/<32-hex-digit-id>/Library/NoCloud/../ | ||
| parentDirectory = window['cordova'].file.dataDirectory + '../'; | ||
| pathToFile = 'LocalDatabase/' + fileName; | ||
| } else { | ||
| displayErrorMsg('Error: Unknown OS!'); | ||
| throw new Error('Error: Unknown OS!'); | ||
| } | ||
|
|
||
| window['resolveLocalFileSystemURL'](parentDirectory, (fs) => { | ||
| // On iOS, pass in relative path to getFile https://github.com/e-mission/e-mission-phone/pull/1160#issuecomment-2192112472 | ||
| // On Android, pass in absolute path to getFile https://github.com/e-mission/e-mission-phone/pull/1160#issuecomment-2204297874 | ||
| fs.filesystem.root.getFile(pathToFile, { create: false, exclusive: false }, (fileEntry) => { | ||
| // logDebug(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`); | ||
| logDebug(`fileEntry is: ${JSON.stringify(fileEntry, null, 2)}`); | ||
| window['resolveLocalFileSystemURL'](window['cordova'].file.cacheDirectory, (copyDir) => { | ||
| logDebug(`DirectoryEntry is: ${JSON.stringify(copyDir.filesystem.root, null, 2)}`); | ||
|
|
||
| fileEntry.copyTo( | ||
| copyDir.filesystem.root, | ||
| fileName + fileExtension, | ||
| (res) => { | ||
| logDebug(`Res: ${res}`); | ||
| resolve(); | ||
| }, | ||
| (rej) => { | ||
| displayErrorMsg(`Rej: ${JSON.stringify(rej, null, 2)}`); | ||
| reject(); | ||
| }, | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| function localShareFile() { | ||
| return new Promise<void>((resolve, reject) => { | ||
| window['resolveLocalFileSystemURL'](window['cordova'].file.cacheDirectory, (fs) => { | ||
| fs.filesystem.root.getFile( | ||
| fileName + fileExtension, | ||
| null, | ||
| (fileEntry) => { | ||
| const shareObj = { | ||
| files: [fileEntry.nativeURL], | ||
| message: i18next.t('shareFile-service.send-log.body-please-fill-in-what-is-wrong'), | ||
| subject: i18next.t('shareFile-service.send-log.subject-logs'), | ||
| }; | ||
| window['plugins'].socialsharing.shareWithOptions( | ||
| shareObj, | ||
| (result) => { | ||
| logDebug(`Share Completed? ${result.completed}`); // On Android, most likely returns false | ||
| logDebug(`Shared to app: ${result.app}`); | ||
| resolve(); | ||
| }, | ||
| (error) => { | ||
| displayError(error, `Sharing failed with error`); | ||
| }, | ||
| ); | ||
| }, | ||
| (error) => { | ||
| displayError(error, 'Error while sharing logs'); | ||
| reject(error); | ||
| }, | ||
| ); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| function localClearTmpFile() { | ||
| return new Promise<void>((resolve, reject) => { | ||
| window['resolveLocalFileSystemURL'](window['cordova'].file.cacheDirectory, (fs) => { | ||
| fs.filesystem.root.getFile(fileName + fileExtension, null, (fileEntry) => { | ||
| fileEntry.remove( | ||
| () => { | ||
| logDebug(`Successfully cleaned up file ${fileName}`); | ||
| resolve(); | ||
| }, | ||
| (err) => { | ||
| displayError(err, `Error deleting ${fileName}`); | ||
| reject(err); | ||
| }, | ||
| ); | ||
| }); | ||
| }); | ||
| }); | ||
| } | ||
|
|
||
| return { | ||
| copyFile: localCopyFile, | ||
| shareData: localShareFile, | ||
| clearTmpFile: localClearTmpFile, | ||
| }; | ||
| } | ||
| export async function sendLocalDBFile(database: string) { | ||
| alert(i18next.t('shareFile-service.send-to')); | ||
|
|
||
| const dataMethods = localDBHelpers(database); | ||
| dataMethods | ||
| .copyFile() | ||
| .then(dataMethods.shareData) | ||
| .then(dataMethods.clearTmpFile) | ||
| .then(() => { | ||
| logDebug(`File Shared!`); | ||
| }) | ||
| .catch((err) => { | ||
| displayError(err); | ||
| }); | ||
| } |