Switched to old fileIO, fixes issue with android

- Android was having issues with the new fileIO - since we are not mocking these functions, we can switch back for now.
e-mission · Nov 17, 2023 · dbe76d1 · dbe76d1
1 parent 2c02e37
commit dbe76d1
Showing 1 changed file with 21 additions and 48 deletions.
diff --git a/www/js/services/controlHelper.ts b/www/js/services/controlHelper.ts
@@ -16,38 +16,34 @@ export const getMyDataHelpers = function (
   const localWriteFile = function (result: ServerResponse<any>) {
     const resultList = result.phone_data;
     return new Promise<void>(function (resolve, reject) {
-      window['resolveLocalFileSystemURL'](window['cordova'].file.tempDirectory, function (fs) {
-        fs.filesystem.root.getFile(
-          fileName,
-          { create: true, exclusive: false },
-          function (fileEntry) {
-            logDebug(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`);
-            fileEntry.createWriter(function (fileWriter) {
-              fileWriter.onwriteend = function () {
-                logDebug('Successful file write...');
-                resolve();
-              };
-              fileWriter.onerror = function (e) {
-                logDebug(`Failed file write: ${e.toString()}`);
-                reject();
-              };
-              logDebug(`fileWriter is: ${JSON.stringify(fileWriter.onwriteend, null, 2)}`);
-              // if data object is not passed in, create a new blob instead.
-              const dataObj = new Blob([JSON.stringify(resultList, null, 2)], {
-                type: 'application/json',
-              });
-              fileWriter.write(dataObj);
+      window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function (fs) {
+        fs.root.getFile(fileName, { create: true, exclusive: false }, function (fileEntry) {
+          logDebug(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`);
+          fileEntry.createWriter(function (fileWriter) {
+            fileWriter.onwriteend = function () {
+              logDebug('Successful file write...');
+              resolve();
+            };
+            fileWriter.onerror = function (e) {
+              logDebug(`Failed file write: ${e.toString()}`);
+              reject();
+            };
+            logDebug(`fileWriter is: ${JSON.stringify(fileWriter.onwriteend, null, 2)}`);
+            // if data object is not passed in, create a new blob instead.
+            const dataObj = new Blob([JSON.stringify(resultList, null, 2)], {
+              type: 'application/json',
             });
-          },
-        );
+            fileWriter.write(dataObj);
+          });
+        });
       });
     });
   };
 
   const localShareData = function () {
     return new Promise<void>(function (resolve, reject) {
-      window['resolveLocalFileSystemURL'](window['cordova'].file.tempDirectory, function (fs) {
-        fs.filesystem.root.getFile(fileName, null, function (fileEntry) {
+      window.requestFileSystem(window.LocalFileSystem.TEMPORARY, 0, function (fs) {
+        fs.root.getFile(fileName, null, function (fileEntry) {
           logDebug(`fileEntry ${fileEntry.nativeURL} is file? ${fileEntry.isFile.toString()}`);
           fileEntry.file(
             function (file) {
@@ -93,31 +89,9 @@ export const getMyDataHelpers = function (
     });
   };
 
-  // window['cordova'].file.TempDirectory is not guaranteed to free up memory,
-  // so it's good practice to remove the file right after it's used!
-  const localClearData = function () {
-    return new Promise<void>(function (resolve, reject) {
-      window['resolveLocalFileSystemURL'](window['cordova'].file.tempDirectory, function (fs) {
-        fs.filesystem.root.getFile(fileName, null, function (fileEntry) {
-          fileEntry.remove(
-            () => {
-              logDebug(`Successfully cleaned up file ${fileName}`);
-              resolve();
-            },
-            (err) => {
-              logWarn(`Error deleting ${fileName} : ${err}`);
-              reject(err);
-            },
-          );
-        });
-      });
-    });
-  };
-
   return {
     writeFile: localWriteFile,
     shareData: localShareData,
-    clearData: localClearData,
   };
 };
 
@@ -141,7 +115,6 @@ export const getMyData = function (timeStamp: Date) {
   getRawEntries(null, startTime.toUnixInteger(), endTime.toUnixInteger())
     .then(getDataMethods.writeFile)
     .then(getDataMethods.shareData)
-    .then(getDataMethods.clearData)
     .then(function () {
       logInfo('Share queued successfully');
     })