From 5dc046cc3983be54e9e8cd5ef533f2da5a0c7fc2 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 21 May 2021 08:27:41 -0700
Subject: [PATCH] Resolve image/video issues during upload by using local URI.

---
 app.json                                        |  6 +++---
 .../screen-media-browser.component.jsx          |  7 ++++++-
 .../screen-settings.component.jsx               |  6 +++++-
 env.js                                          | 17 +++++++++++++----
 redux/app/app.reducer.js                        |  2 +-
 util/document-upload.utility.js                 | 17 +++++++++++------
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/app.json b/app.json
index 9acfb58..5bb7ec4 100644
--- a/app.json
+++ b/app.json
@@ -2,18 +2,18 @@
   "expo": {
     "name": "imexmobile",
     "slug": "imexmobile",
-    "version": "1.0.12",
+    "version": "1.1.0",
     "orientation": "default",
     "icon": "./assets/logo192noa.png",
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "com.imex.imexmobile",
-      "buildNumber": "1.0.12.1",
+      "buildNumber": "1.1.0.1",
       "googleServicesFile": "./GoogleService-Info.plist"
     },
     "android": {
       "package": "com.imex.imexmobile",
-      "versionCode": 1001201,
+      "versionCode": 1010001,
       "googleServicesFile": "./google-services.json"
     },
     "splash": {
diff --git a/components/screen-media-browser/screen-media-browser.component.jsx b/components/screen-media-browser/screen-media-browser.component.jsx
index d9c109f..6b61aa1 100644
--- a/components/screen-media-browser/screen-media-browser.component.jsx
+++ b/components/screen-media-browser/screen-media-browser.component.jsx
@@ -57,6 +57,10 @@ export function ImageBrowserScreen({
   }
 
   const onDone = async (data) => {
+    console.log(
+      "🚀  ~ file: screen-media-browser.component.jsx  ~ line 60  ~ data",
+      data
+    );
     logImEXEvent("imexmobile_upload_documents", { count: data.length });
 
     //Validate to make sure the totals for the file sizes do not exceed the total on the job.
@@ -73,6 +77,7 @@ export function ImageBrowserScreen({
       const totalOfUploads = await data.reduce(async (acc, val) => {
         //Get the size of the file based on URI.
         const info = await FileSystem.getInfoAsync(val.uri, { size: true });
+
         return (await acc) + info.size;
       }, 0);
 
@@ -112,7 +117,7 @@ export function ImageBrowserScreen({
         const result = await handleUpload(
           {
             //iOS provides the file name. Android does not.
-            uri: p.uri,
+
             filename,
             mediaId: p.id,
             onError: handleOnError,
diff --git a/components/screen-settings/screen-settings.component.jsx b/components/screen-settings/screen-settings.component.jsx
index ddb0fd1..4281fd7 100644
--- a/components/screen-settings/screen-settings.component.jsx
+++ b/components/screen-settings/screen-settings.component.jsx
@@ -5,8 +5,12 @@ import { Button, View, Text } from "react-native";
 import { Title } from "react-native-paper";
 import { purgeStoredState } from "redux-persist";
 import SignOutButton from "../sign-out-button/sign-out-button.component";
+import * as Updates from "expo-updates";
+
 export default function ScreenSettingsComponent() {
   const { t } = useTranslation();
+
+  console.log(Constants.manifest);
   return (
     <View
       style={{
@@ -22,9 +26,9 @@ export default function ScreenSettingsComponent() {
           number: Constants.manifest.version,
         })}
       </Title>
+      <Text>{Updates.releaseChannel}</Text>
       <SignOutButton />
       <Button title="Purge State" onPress={() => purgeStoredState()} />
-      <Text>Test Channel</Text>
     </View>
   );
 }
diff --git a/env.js b/env.js
index 8242991..4b2a17c 100644
--- a/env.js
+++ b/env.js
@@ -44,10 +44,19 @@ const ENV = {
 };
 
 function getEnvVars() {
-  let env = Updates.releaseChannel;
-  if (env === null || env === undefined || env === "") return ENV.test;
-  if (env.indexOf("test") !== -1) return ENV.test;
-  if (env.indexOf("default") !== -1) return ENV.prod;
+  if (process.env.NODE_ENV === "development") return ENV.test;
+
+  let releaseChannel = Updates.releaseChannel;
+  if (
+    releaseChannel === null ||
+    releaseChannel === undefined ||
+    releaseChannel === ""
+  )
+    return ENV.test;
+  if (releaseChannel.indexOf("development") !== -1) return ENV.test;
+
+  if (releaseChannel.indexOf("test") !== -1) return ENV.test;
+  if (releaseChannel.indexOf("default") !== -1) return ENV.prod;
   else return ENV.prod;
 }
 
diff --git a/redux/app/app.reducer.js b/redux/app/app.reducer.js
index c267510..aa15d0c 100644
--- a/redux/app/app.reducer.js
+++ b/redux/app/app.reducer.js
@@ -5,7 +5,7 @@ const INITIAL_STATE = {
   cameraJob: null,
   documentUploadInProgress: null,
   documentUploadError: null,
-  deleteAfterUpload: true,
+  deleteAfterUpload: false,
 };
 
 const appReducer = (state = INITIAL_STATE, action) => {
diff --git a/util/document-upload.utility.js b/util/document-upload.utility.js
index ecd8af9..f1c0f78 100644
--- a/util/document-upload.utility.js
+++ b/util/document-upload.utility.js
@@ -12,19 +12,24 @@ var cleanAxios = axios.create();
 cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
 
 export const handleUpload = async (ev, context) => {
-  const { uri, filename, mediaId, onError, onSuccess, onProgress } = ev;
+  const { filename, mediaId, onError, onSuccess, onProgress } = ev;
   const { bodyshop, jobId } = context;
 
-  const newFile = await (await fetch(uri)).blob();
-  let extension = ev.uri.split(".").pop();
+  const imageData = await MediaLibrary.getAssetInfoAsync(mediaId);
+
+  const newFile = await (await fetch(imageData.localUri)).blob();
+
+  let extension = imageData.localUri.split(".").pop();
 
   let key = `${bodyshop.id}/${jobId}/${(filename || newFile.data.name).replace(
     /\.[^/.]+$/,
     ""
   )}`;
+
   const res = await uploadToCloudinary(
     key,
     mediaId,
+    imageData,
     extension,
     newFile.type,
     newFile,
@@ -39,6 +44,7 @@ export const handleUpload = async (ev, context) => {
 export const uploadToCloudinary = async (
   key,
   mediaId,
+  imageData,
   extension,
   fileType,
   file,
@@ -91,10 +97,11 @@ export const uploadToCloudinary = async (
       if (onProgress) onProgress({ percent: e.loaded / e.total });
     },
   };
+
   const formData = new FormData();
 
   formData.append("file", {
-    uri: photo.uri,
+    uri: imageData.localUri,
     type: fileType,
     name: file.data.name,
   });
@@ -135,8 +142,6 @@ export const uploadToCloudinary = async (
     return { success: false, error: cloudinaryUploadResponse.statusText };
   }
 
-  const imageData = await MediaLibrary.getAssetInfoAsync(mediaId);
-
   //Insert the document with the matching key.
   const documentInsert = await client.mutate({
     mutation: INSERT_NEW_DOCUMENT,