From 26e9bf87c8da6a6e6b00457dc122b12a2e5c5b0b Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 19 May 2022 15:49:59 -0700 Subject: [PATCH] 1.3.6-5 Resolve uploads for cloudinary. --- app.json | 6 +- .../local-upload-progress.component.jsx | 20 +- .../screen-main/screen-main.component.jsx | 2 +- .../screen-settings.component.jsx | 2 +- .../sign-out-button.component.jsx | 1 + util/document-upload.utility.js | 17 +- yarn.lock | 986 +++++++++--------- 7 files changed, 512 insertions(+), 522 deletions(-) diff --git a/app.json b/app.json index 359f765..3311360 100644 --- a/app.json +++ b/app.json @@ -4,19 +4,19 @@ "slug": "imexmobile", "version": "1.3.6", "extra": { - "expover": "4" + "expover": "5" }, "orientation": "default", "icon": "./assets/logo192noa.png", "ios": { "supportsTablet": true, "bundleIdentifier": "com.imex.imexmobile", - "buildNumber": "4", + "buildNumber": "5", "googleServicesFile": "./GoogleService-Info.plist" }, "android": { "package": "com.imex.imexmobile", - "versionCode": 1100009, + "versionCode": 1100010, "googleServicesFile": "./google-services.json" }, "splash": { diff --git a/components/local-upload-progress/local-upload-progress.component.jsx b/components/local-upload-progress/local-upload-progress.component.jsx index 4df3132..5026597 100644 --- a/components/local-upload-progress/local-upload-progress.component.jsx +++ b/components/local-upload-progress/local-upload-progress.component.jsx @@ -1,5 +1,4 @@ import * as MediaLibrary from "expo-media-library"; -import { DateTime } from "luxon"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { @@ -50,8 +49,6 @@ export function UploadProgress({ speed: 0, }); - let filesToDelete = []; - const { t } = useTranslation(); useEffect(() => { @@ -118,22 +115,12 @@ export function UploadProgress({ if (deleteAfterUpload) { try { - const a = await MediaLibrary.getAssetsAsync(); - - const res = await Promise.all( - filesToDelete.map((f) => { - return MediaLibrary.removeAssetsFromAlbumAsync(f, f.albumId); - }) - ); - - const deleteResult = await MediaLibrary.deleteAssetsAsync( - filesToDelete.map((f) => f.id) - ); + await MediaLibrary.deleteAssetsAsync(data); } catch (error) { console.log("Unable to delete picture.", error); } } - filesToDelete = []; + setProgress({ loading: false, speed: 0, @@ -143,7 +130,6 @@ export function UploadProgress({ forceRerender(); }; - console.log(progress); return ( {`Total Uploaded ${formatBytes(progress.loaded)}/sec`} + >{`Total Uploaded ${formatBytes(progress.loaded)}`} {`Duration ${( (new Date() - progress.start) / 1000 diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx index 0641953..3d524ad 100644 --- a/components/screen-main/screen-main.component.jsx +++ b/components/screen-main/screen-main.component.jsx @@ -5,7 +5,7 @@ import { createStackNavigator } from "@react-navigation/stack"; import i18n from "i18next"; import React, { useEffect } from "react"; import { Button } from "react-native-paper"; -import { SafeAreaView } from "react-native"; +import { SafeAreaView } from "react-native-safe-area-context"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; import { logImEXEvent } from "../../firebase/firebase.analytics"; diff --git a/components/screen-settings/screen-settings.component.jsx b/components/screen-settings/screen-settings.component.jsx index b9d55b9..8696345 100644 --- a/components/screen-settings/screen-settings.component.jsx +++ b/components/screen-settings/screen-settings.component.jsx @@ -27,7 +27,7 @@ export default function ScreenSettingsComponent() { Release Channel {Updates.releaseChannel} -