wip

cboard-org · Nov 14, 2019 · bbdf298 · bbdf298
1 parent e6eff84
commit bbdf298
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 11 deletions.
diff --git a/src/components/UI/InputImage/InputImage.component.js b/src/components/UI/InputImage/InputImage.component.js
@@ -73,10 +73,10 @@ class InputImage extends PureComponent {
         onChange(imageUrl);
       } catch (error) {
         if (isCordova()) {
-          const fileFullName = window.cordova.file.dataDirectory + file.name;
-          console.log(fileFullName);
-          const fileEntry = await writeCvaFile(fileFullName, resizedImage);
-          onChange(fileEntry.toURL);
+          const filePath = '/Android/data/com.unicef.cboard/files/' + file.name;
+          const fEntry = await writeCvaFile(filePath, resizedImage);
+          console.log(fEntry);
+          onChange(fEntry.nativeURL);
         } else {
           const imageBase64 = this.blobToBase64(resizedImage);
           onChange(imageBase64);
@@ -87,8 +87,14 @@ class InputImage extends PureComponent {
         });
       }
     } else {
-      const imageBase64 = this.blobToBase64(resizedImage);
-      onChange(imageBase64);
+      if (isCordova()) {
+        const filePath = '/Android/data/com.unicef.cboard/files/' + file.name;
+        writeCvaFile(filePath, resizedImage);
+        onChange(filePath);
+      } else {
+        const imageBase64 = this.blobToBase64(resizedImage);
+        onChange(imageBase64);
+      }
     }
   };
 

diff --git a/src/cordova-util.js b/src/cordova-util.js
@@ -5,23 +5,47 @@ export const onCordovaReady = onReady =>
 
 export const writeCvaFile = async (name, blob) => {
   if (isCordova()) {
-    window.requestFileSystem(
+    return new Promise(function(resolve, reject) {
+      window.requestFileSystem(
+        window.LocalFileSystem.PERSISTENT,
+        0,
+        function(fs) {
+          fs.root.getFile(
+            name,
+            { create: true, exclusive: false },
+            function(fileEntry) {
+              writeFile(fileEntry, blob);
+              resolve(fileEntry);
+            },
+            onErrorCreateFile
+          );
+        },
+        onErrorLoadFs
+      );
+    });
+  }
+};
+
+export const getCvaFileEntry = async name => {
+  if (isCordova()) {
+    const fe = window.requestFileSystem(
       window.LocalFileSystem.PERSISTENT,
       0,
       function(fs) {
         fs.root.getFile(
           name,
-          { create: true, exclusive: false },
+          { create: false, exclusive: false },
           function(fileEntry) {
-            writeFile(fileEntry, blob);
             return fileEntry;
           },
           onErrorCreateFile
         );
       },
       onErrorLoadFs
     );
+    return fe;
   }
+  return null;
 };
 
 const writeFile = (fileEntry, dataObj) => {
@@ -38,8 +62,12 @@ const writeFile = (fileEntry, dataObj) => {
   });
 };
 
-const onErrorCreateFile = () => {};
-const onErrorLoadFs = () => {};
+const onErrorCreateFile = e => {
+  console.log('Error status: ' + e.status + ' - Error message: ' + e.message);
+};
+const onErrorLoadFs = e => {
+  console.log('Error status: ' + e.status + ' - Error message: ' + e.message);
+};
 
 export const fileCvaOpen = (filePath, type) => {
   if (isCordova()) {